Revert of Rename AppRTCDemo on Android and iOS to AppRTCMobile (patchset #2 id:20001 of https://codereview.webrtc.org/2343403002/ )

Reason for revert:
Breaks internal project.

Original issue's description:
> Rename AppRTCDemo on Android and iOS to AppRTCMobile
>
> The purpose is to make it clearer it is a mobile application.
>
> BUG=webrtc:6359
> NOPRESUBMIT=true
>
> Committed: https://crrev.com/d3af58bdab5b25acd62cd816363becc7003d3e5a
> Cr-Commit-Position: refs/heads/master@{#14356}

TBR=sakal@webrtc.org,kthelgason@webrtc.org,tommi@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6359

Review-Url: https://codereview.webrtc.org/2358133003
Cr-Commit-Position: refs/heads/master@{#14358}

webrtc/BUILD.gn

@@ -847,7 +847,7 @@ if (rtc_include_tests) {
       deps = [
         "//webrtc/api:libjingle_peerconnection_java",
         "//webrtc/api:libjingle_peerconnection_jni",
-        "//webrtc/examples:AppRTCMobile_javalib",
+        "//webrtc/examples:AppRTCDemo_javalib",
       ]
     }
   }

webrtc/examples/BUILD.gn

@@ -23,7 +23,7 @@ group("examples") {
   public_deps = []
 
   if (is_android) {
-    public_deps += [ ":AppRTCMobile" ]
+    public_deps += [ ":AppRTCDemo" ]
   }
   if (is_linux) {
     public_deps += [
@@ -37,13 +37,13 @@ group("examples") {
 }
 
 if (is_android) {
-  android_apk("AppRTCMobile") {
+  android_apk("AppRTCDemo") {
-    apk_name = "AppRTCMobile"
+    apk_name = "AppRTCDemo"
     android_manifest = "androidapp/AndroidManifest.xml"
 
     deps = [
-      ":AppRTCMobile_javalib",
+      ":AppRTCDemo_javalib",
-      ":AppRTCMobile_resources",
+      ":AppRTCDemo_resources",
       "//base:base_java",
       "//webrtc/base:base_java",
     ]
@@ -51,7 +51,7 @@ if (is_android) {
     shared_libraries = [ "//webrtc/api:libjingle_peerconnection_so" ]
   }
 
-  android_library("AppRTCMobile_javalib") {
+  android_library("AppRTCDemo_javalib") {
     java_files = [
       "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java",
       "androidapp/src/org/appspot/apprtc/AppRTCClient.java",
@@ -77,28 +77,28 @@ if (is_android) {
     ]
 
     deps = [
-      ":AppRTCMobile_resources",
+      ":AppRTCDemo_resources",
       "//webrtc/api:libjingle_peerconnection_java",
       "//webrtc/base:base_java",
       "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java",
     ]
   }
 
-  android_resources("AppRTCMobile_resources") {
+  android_resources("AppRTCDemo_resources") {
     resource_dirs = [ "androidapp/res" ]
     custom_package = "org.appspot.apprtc"
   }
 
-  instrumentation_test_apk("AppRTCMobileTest") {
+  instrumentation_test_apk("AppRTCDemoTest") {
-    apk_name = "AppRTCMobileTest"
+    apk_name = "AppRTCDemoTest"
     android_manifest = "androidtests/AndroidManifest.xml"
 
     java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ]
 
-    apk_under_test = ":AppRTCMobile"
+    apk_under_test = ":AppRTCDemo"
 
     deps = [
-      ":AppRTCMobile_javalib",
+      ":AppRTCDemo_javalib",
       "//webrtc/api:libjingle_peerconnection_java",
     ]
   }
@@ -118,13 +118,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   config("apprtc_common_config") {
-    include_dirs = [ "objc/AppRTCMobile/common" ]
+    include_dirs = [ "objc/AppRTCDemo/common" ]
   }
 
   rtc_source_set("apprtc_common") {
     sources = [
-      "objc/AppRTCMobile/common/ARDUtilities.h",
+      "objc/AppRTCDemo/common/ARDUtilities.h",
-      "objc/AppRTCMobile/common/ARDUtilities.m",
+      "objc/AppRTCDemo/common/ARDUtilities.m",
     ]
     configs += [
       ":warnings_config",
@@ -140,7 +140,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   config("apprtc_signaling_config") {
-    include_dirs = [ "objc/AppRTCMobile" ]
+    include_dirs = [ "objc/AppRTCDemo" ]
 
     # GN orders flags on a target before flags from configs. The default config
     # adds these flags so to cancel them out they need to come from a config and
@@ -156,40 +156,40 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 
   rtc_source_set("apprtc_signaling") {
     sources = [
-      "objc/AppRTCMobile/ARDAppClient+Internal.h",
+      "objc/AppRTCDemo/ARDAppClient+Internal.h",
-      "objc/AppRTCMobile/ARDAppClient.h",
+      "objc/AppRTCDemo/ARDAppClient.h",
-      "objc/AppRTCMobile/ARDAppClient.m",
+      "objc/AppRTCDemo/ARDAppClient.m",
-      "objc/AppRTCMobile/ARDAppEngineClient.h",
+      "objc/AppRTCDemo/ARDAppEngineClient.h",
-      "objc/AppRTCMobile/ARDAppEngineClient.m",
+      "objc/AppRTCDemo/ARDAppEngineClient.m",
-      "objc/AppRTCMobile/ARDBitrateTracker.h",
+      "objc/AppRTCDemo/ARDBitrateTracker.h",
-      "objc/AppRTCMobile/ARDBitrateTracker.m",
+      "objc/AppRTCDemo/ARDBitrateTracker.m",
-      "objc/AppRTCMobile/ARDCEODTURNClient.h",
+      "objc/AppRTCDemo/ARDCEODTURNClient.h",
-      "objc/AppRTCMobile/ARDCEODTURNClient.m",
+      "objc/AppRTCDemo/ARDCEODTURNClient.m",
-      "objc/AppRTCMobile/ARDJoinResponse+Internal.h",
+      "objc/AppRTCDemo/ARDJoinResponse+Internal.h",
-      "objc/AppRTCMobile/ARDJoinResponse.h",
+      "objc/AppRTCDemo/ARDJoinResponse.h",
-      "objc/AppRTCMobile/ARDJoinResponse.m",
+      "objc/AppRTCDemo/ARDJoinResponse.m",
-      "objc/AppRTCMobile/ARDMessageResponse+Internal.h",
+      "objc/AppRTCDemo/ARDMessageResponse+Internal.h",
-      "objc/AppRTCMobile/ARDMessageResponse.h",
+      "objc/AppRTCDemo/ARDMessageResponse.h",
-      "objc/AppRTCMobile/ARDMessageResponse.m",
+      "objc/AppRTCDemo/ARDMessageResponse.m",
-      "objc/AppRTCMobile/ARDRoomServerClient.h",
+      "objc/AppRTCDemo/ARDRoomServerClient.h",
-      "objc/AppRTCMobile/ARDSDPUtils.h",
+      "objc/AppRTCDemo/ARDSDPUtils.h",
-      "objc/AppRTCMobile/ARDSDPUtils.m",
+      "objc/AppRTCDemo/ARDSDPUtils.m",
-      "objc/AppRTCMobile/ARDSignalingChannel.h",
+      "objc/AppRTCDemo/ARDSignalingChannel.h",
-      "objc/AppRTCMobile/ARDSignalingMessage.h",
+      "objc/AppRTCDemo/ARDSignalingMessage.h",
-      "objc/AppRTCMobile/ARDSignalingMessage.m",
+      "objc/AppRTCDemo/ARDSignalingMessage.m",
-      "objc/AppRTCMobile/ARDStatsBuilder.h",
+      "objc/AppRTCDemo/ARDStatsBuilder.h",
-      "objc/AppRTCMobile/ARDStatsBuilder.m",
+      "objc/AppRTCDemo/ARDStatsBuilder.m",
-      "objc/AppRTCMobile/ARDTURNClient.h",
+      "objc/AppRTCDemo/ARDTURNClient.h",
-      "objc/AppRTCMobile/ARDWebSocketChannel.h",
+      "objc/AppRTCDemo/ARDWebSocketChannel.h",
-      "objc/AppRTCMobile/ARDWebSocketChannel.m",
+      "objc/AppRTCDemo/ARDWebSocketChannel.m",
-      "objc/AppRTCMobile/RTCIceCandidate+JSON.h",
+      "objc/AppRTCDemo/RTCIceCandidate+JSON.h",
-      "objc/AppRTCMobile/RTCIceCandidate+JSON.m",
+      "objc/AppRTCDemo/RTCIceCandidate+JSON.m",
-      "objc/AppRTCMobile/RTCIceServer+JSON.h",
+      "objc/AppRTCDemo/RTCIceServer+JSON.h",
-      "objc/AppRTCMobile/RTCIceServer+JSON.m",
+      "objc/AppRTCDemo/RTCIceServer+JSON.m",
-      "objc/AppRTCMobile/RTCMediaConstraints+JSON.h",
+      "objc/AppRTCDemo/RTCMediaConstraints+JSON.h",
-      "objc/AppRTCMobile/RTCMediaConstraints+JSON.m",
+      "objc/AppRTCDemo/RTCMediaConstraints+JSON.m",
-      "objc/AppRTCMobile/RTCSessionDescription+JSON.h",
+      "objc/AppRTCDemo/RTCSessionDescription+JSON.h",
-      "objc/AppRTCMobile/RTCSessionDescription+JSON.m",
+      "objc/AppRTCDemo/RTCSessionDescription+JSON.m",
     ]
     configs += [
       "//build/config/compiler:enable_arc",
@@ -207,26 +207,26 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   if (is_ios) {
-    ios_app_bundle("AppRTCMobile") {
+    ios_app_bundle("AppRTCDemo") {
       sources = [
-        "objc/AppRTCMobile/ios/ARDAppDelegate.m",
+        "objc/AppRTCDemo/ios/ARDAppDelegate.m",
-        "objc/AppRTCMobile/ios/ARDMainView.h",
+        "objc/AppRTCDemo/ios/ARDMainView.h",
-        "objc/AppRTCMobile/ios/ARDMainView.m",
+        "objc/AppRTCDemo/ios/ARDMainView.m",
-        "objc/AppRTCMobile/ios/ARDMainViewController.h",
+        "objc/AppRTCDemo/ios/ARDMainViewController.h",
-        "objc/AppRTCMobile/ios/ARDMainViewController.m",
+        "objc/AppRTCDemo/ios/ARDMainViewController.m",
-        "objc/AppRTCMobile/ios/ARDStatsView.h",
+        "objc/AppRTCDemo/ios/ARDStatsView.h",
-        "objc/AppRTCMobile/ios/ARDStatsView.m",
+        "objc/AppRTCDemo/ios/ARDStatsView.m",
-        "objc/AppRTCMobile/ios/ARDVideoCallView.h",
+        "objc/AppRTCDemo/ios/ARDVideoCallView.h",
-        "objc/AppRTCMobile/ios/ARDVideoCallView.m",
+        "objc/AppRTCDemo/ios/ARDVideoCallView.m",
-        "objc/AppRTCMobile/ios/ARDVideoCallViewController.h",
+        "objc/AppRTCDemo/ios/ARDVideoCallViewController.h",
-        "objc/AppRTCMobile/ios/ARDVideoCallViewController.m",
+        "objc/AppRTCDemo/ios/ARDVideoCallViewController.m",
-        "objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch",
+        "objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch",
-        "objc/AppRTCMobile/ios/UIImage+ARDUtilities.h",
+        "objc/AppRTCDemo/ios/UIImage+ARDUtilities.h",
-        "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m",
+        "objc/AppRTCDemo/ios/UIImage+ARDUtilities.m",
-        "objc/AppRTCMobile/ios/main.m",
+        "objc/AppRTCDemo/ios/main.m",
       ]
 
-      info_plist = "objc/AppRTCMobile/ios/Info.plist"
+      info_plist = "objc/AppRTCDemo/ios/Info.plist"
 
       configs += [
         "..:common_config",
@@ -236,7 +236,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       public_configs = [ "..:common_inherited_config" ]
 
       deps = [
-        ":AppRTCMobile_ios_bundle_data",
+        ":AppRTCDemo_ios_bundle_data",
         ":apprtc_common",
         ":apprtc_signaling",
       ]
@@ -246,21 +246,21 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       }
     }
 
-    bundle_data("AppRTCMobile_ios_bundle_data") {
+    bundle_data("AppRTCDemo_ios_bundle_data") {
       sources = [
-        "objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf",
+        "objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf",
-        "objc/AppRTCMobile/ios/resources/iPhone5@2x.png",
+        "objc/AppRTCDemo/ios/resources/iPhone5@2x.png",
-        "objc/AppRTCMobile/ios/resources/iPhone6@2x.png",
+        "objc/AppRTCDemo/ios/resources/iPhone6@2x.png",
-        "objc/AppRTCMobile/ios/resources/iPhone6p@3x.png",
+        "objc/AppRTCDemo/ios/resources/iPhone6p@3x.png",
-        "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png",
+        "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png",
-        "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png",
+        "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png",
-        "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png",
+        "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png",
-        "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png",
+        "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png",
-        "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png",
+        "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png",
-        "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png",
+        "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png",
-        "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png",
+        "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png",
-        "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png",
+        "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png",
-        "objc/AppRTCMobile/ios/resources/mozart.mp3",
+        "objc/AppRTCDemo/ios/resources/mozart.mp3",
         "objc/Icon.png",
       ]
       outputs = [
@@ -270,12 +270,12 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   if (is_mac) {
-    rtc_source_set("AppRTCMobile_app") {
+    rtc_source_set("AppRTCDemo_app") {
       sources = [
-        "objc/AppRTCMobile/mac/APPRTCAppDelegate.h",
+        "objc/AppRTCDemo/mac/APPRTCAppDelegate.h",
-        "objc/AppRTCMobile/mac/APPRTCAppDelegate.m",
+        "objc/AppRTCDemo/mac/APPRTCAppDelegate.m",
-        "objc/AppRTCMobile/mac/APPRTCViewController.h",
+        "objc/AppRTCDemo/mac/APPRTCViewController.h",
-        "objc/AppRTCMobile/mac/APPRTCViewController.m",
+        "objc/AppRTCDemo/mac/APPRTCViewController.m",
       ]
       configs += [
         "..:common_objc",
@@ -287,29 +287,29 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       ]
     }
 
-    mac_app_bundle("AppRTCMobile") {
+    mac_app_bundle("AppRTCDemo") {
-      output_name = "AppRTCMobile"
+      output_name = "AppRTCDemo"
 
       extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.8" ]
 
       sources = [
-        "objc/AppRTCMobile/mac/main.m",
+        "objc/AppRTCDemo/mac/main.m",
       ]
 
       public_configs = [ "..:common_inherited_config" ]
 
-      info_plist = "objc/AppRTCMobile/mac/Info.plist"
+      info_plist = "objc/AppRTCDemo/mac/Info.plist"
 
       libs = [ "AppKit.framework" ]
 
       deps = [
-        ":AppRTCMobile_app",
+        ":AppRTCDemo_app",
       ]
     }
   }
 
   config("socketrocket_include_config") {
-    include_dirs = [ "objc/AppRTCMobile/third_party/SocketRocket" ]
+    include_dirs = [ "objc/AppRTCDemo/third_party/SocketRocket" ]
   }
 
   config("socketrocket_warning_config") {
@@ -340,8 +340,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 
   rtc_source_set("socketrocket") {
     sources = [
-      "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h",
+      "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h",
-      "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m",
+      "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m",
     ]
     configs += [
       "//build/config/compiler:enable_arc",

webrtc/examples/androidapp/README

@@ -7,8 +7,8 @@ Prerequisites:
 Example of building & using the app:
 
 cd <path/to/webrtc>/src
-ninja -C out/Default AppRTCMobile
+ninja -C out/Default AppRTCDemo
-adb install -r out/Default/apks/AppRTCMobile.apk
+adb install -r out/Default/apks/AppRTCDemo.apk
 
 In desktop chrome, navigate to https://appr.tc and note the r=<NNN> room
 this redirects to or navigate directly to https://appr.tc/r/<NNN> with

webrtc/examples/androidapp/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="AppRTCMobile" default="help">
+<project name="AppRTCDemo" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

webrtc/examples/androidapp/res/values-v21/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="AppRTCMobileActivityTheme" parent="android:Theme.Material">
+  <style name="AppRTCDemoActivityTheme" parent="android:Theme.Material">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowFullscreen">true</item>
     <item name="android:windowNoTitle">true</item>

webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

@@ -382,7 +382,7 @@ public class ConnectActivity extends Activity {
     boolean tracing = sharedPref.getBoolean(
             keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_default)));
 
-    // Start AppRTCMobile activity.
+    // Start AppRTCDemo activity.
     Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl);
     if (validateUrl(roomUrl)) {
       Uri uri = Uri.parse(roomUrl);

webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java

@@ -31,7 +31,7 @@ import java.io.StringWriter;
  */
 public class UnhandledExceptionHandler
     implements Thread.UncaughtExceptionHandler {
-  private static final String TAG = "AppRTCMobileActivity";
+  private static final String TAG = "AppRTCDemoActivity";
   private final Activity activity;
 
   public UnhandledExceptionHandler(final Activity activity) {

webrtc/examples/androidjunit/README

@@ -1,4 +1,4 @@
-This directory contains example JUnit tests for Android AppRTCMobile.
+This directory contains example JUnit tests for Android AppRTCDemo.
 Many of these test utilize Robolectric to mock Android classes.
 
 To compile:

webrtc/examples/androidtests/README

@@ -1,14 +1,14 @@
-This directory contains an example unit test for Android AppRTCMobile.
+This directory contains an example unit test for Android AppRTCDemo.
 
 Example of building & using the app:
 
-- Build Android AppRTCMobile and AppRTCMobile unit test:
+- Build Android AppRTCDemo and AppRTCDemo unit test:
 cd <path/to/webrtc>/src
-ninja -C out/Debug AppRTCMobileTest
+ninja -C out/Debug AppRTCDemoTest
 
-- Install AppRTCMobile and AppRTCMobileTest:
+- Install AppRTCDemo and AppRTCDemoTest:
-adb install -r out/Debug/apks/AppRTCMobile.apk
+adb install -r out/Debug/apks/AppRTCDemo.apk
-adb install -r out/Debug/apks/AppRTCMobileTest.apk
+adb install -r out/Debug/apks/AppRTCDemoTest.apk
 
 - Run unit tests:
 adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner

webrtc/examples/androidtests/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="AppRTCMobileTest" default="help">
+<project name="AppRTCDemoTest" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h

@@ -10,7 +10,7 @@
 
 #import <UIKit/UIKit.h>
 
-// The main application class of the AppRTCMobile iOS app demonstrating
+// The main application class of the AppRTCDemo iOS app demonstrating
 // interoperability between the Objective C implementation of PeerConnection
 // and the appr.tc demo webapp.
 @interface ARDAppDelegate : NSObject <UIApplicationDelegate>

webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.h

@@ -26,7 +26,7 @@
 
 @end
 
-// The main view of AppRTCMobile. It contains an input field for entering a room
+// The main view of AppRTCDemo. It contains an input field for entering a room
 // name on apprtc to connect to.
 @interface ARDMainView : UIView
 

webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m

@@ -137,7 +137,7 @@ static CGFloat const kCallControlMargin = 8;
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     _appLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-    _appLabel.text = @"AppRTCMobile";
+    _appLabel.text = @"AppRTCDemo";
     _appLabel.font = [UIFont fontWithName:@"Roboto" size:34];
     _appLabel.textColor = [UIColor colorWithWhite:0 alpha:.2];
     [_appLabel sizeToFit];

webrtc/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch

@@ -9,8 +9,8 @@
  */
 
 //
-// Prefix header for all source files of the 'AppRTCMobile' target in the
+// Prefix header for all source files of the 'AppRTCDemo' target in the
-// 'AppRTCMobile' project
+// 'AppRTCDemo' project
 //
 
 #import <Availability.h>

webrtc/examples/objc/AppRTCDemo/ios/Info.plist

@@ -7,9 +7,9 @@
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleDisplayName</key>
-  <string>AppRTCMobile</string>
+  <string>AppRTCDemo</string>
   <key>CFBundleExecutable</key>
-  <string>AppRTCMobile</string>
+  <string>AppRTCDemo</string>
   <key>CFBundleIcons</key>
   <dict>
     <key>CFBundlePrimaryIcon</key>
@@ -21,11 +21,11 @@
     </dict>
   </dict>
   <key>CFBundleIdentifier</key>
-  <string>com.google.AppRTCMobile</string>
+  <string>com.google.AppRTCDemo</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
-  <string>AppRTCMobile</string>
+  <string>AppRTCDemo</string>
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>

webrtc/webrtc_examples.gyp

@@ -156,15 +156,15 @@
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
           ],
           'sources': [
-            'examples/objc/AppRTCMobile/common/ARDUtilities.h',
+            'examples/objc/AppRTCDemo/common/ARDUtilities.h',
-            'examples/objc/AppRTCMobile/common/ARDUtilities.m',
+            'examples/objc/AppRTCDemo/common/ARDUtilities.m',
           ],
           'include_dirs': [
-            'examples/objc/AppRTCMobile/common',
+            'examples/objc/AppRTCDemo/common',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCMobile/common',
+              'examples/objc/AppRTCDemo/common',
             ],
           },
           'conditions': [
@@ -204,47 +204,47 @@
             'socketrocket',
           ],
           'sources': [
-            'examples/objc/AppRTCMobile/ARDAppClient.h',
+            'examples/objc/AppRTCDemo/ARDAppClient.h',
-            'examples/objc/AppRTCMobile/ARDAppClient.m',
+            'examples/objc/AppRTCDemo/ARDAppClient.m',
-            'examples/objc/AppRTCMobile/ARDAppClient+Internal.h',
+            'examples/objc/AppRTCDemo/ARDAppClient+Internal.h',
-            'examples/objc/AppRTCMobile/ARDAppEngineClient.h',
+            'examples/objc/AppRTCDemo/ARDAppEngineClient.h',
-            'examples/objc/AppRTCMobile/ARDAppEngineClient.m',
+            'examples/objc/AppRTCDemo/ARDAppEngineClient.m',
-            'examples/objc/AppRTCMobile/ARDBitrateTracker.h',
+            'examples/objc/AppRTCDemo/ARDBitrateTracker.h',
-            'examples/objc/AppRTCMobile/ARDBitrateTracker.m',
+            'examples/objc/AppRTCDemo/ARDBitrateTracker.m',
-            'examples/objc/AppRTCMobile/ARDCEODTURNClient.h',
+            'examples/objc/AppRTCDemo/ARDCEODTURNClient.h',
-            'examples/objc/AppRTCMobile/ARDCEODTURNClient.m',
+            'examples/objc/AppRTCDemo/ARDCEODTURNClient.m',
-            'examples/objc/AppRTCMobile/ARDJoinResponse.h',
+            'examples/objc/AppRTCDemo/ARDJoinResponse.h',
-            'examples/objc/AppRTCMobile/ARDJoinResponse.m',
+            'examples/objc/AppRTCDemo/ARDJoinResponse.m',
-            'examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h',
+            'examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h',
-            'examples/objc/AppRTCMobile/ARDMessageResponse.h',
+            'examples/objc/AppRTCDemo/ARDMessageResponse.h',
-            'examples/objc/AppRTCMobile/ARDMessageResponse.m',
+            'examples/objc/AppRTCDemo/ARDMessageResponse.m',
-            'examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h',
+            'examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h',
-            'examples/objc/AppRTCMobile/ARDRoomServerClient.h',
+            'examples/objc/AppRTCDemo/ARDRoomServerClient.h',
-            'examples/objc/AppRTCMobile/ARDSDPUtils.h',
+            'examples/objc/AppRTCDemo/ARDSDPUtils.h',
-            'examples/objc/AppRTCMobile/ARDSDPUtils.m',
+            'examples/objc/AppRTCDemo/ARDSDPUtils.m',
-            'examples/objc/AppRTCMobile/ARDSignalingChannel.h',
+            'examples/objc/AppRTCDemo/ARDSignalingChannel.h',
-            'examples/objc/AppRTCMobile/ARDSignalingMessage.h',
+            'examples/objc/AppRTCDemo/ARDSignalingMessage.h',
-            'examples/objc/AppRTCMobile/ARDSignalingMessage.m',
+            'examples/objc/AppRTCDemo/ARDSignalingMessage.m',
-            'examples/objc/AppRTCMobile/ARDStatsBuilder.h',
+            'examples/objc/AppRTCDemo/ARDStatsBuilder.h',
-            'examples/objc/AppRTCMobile/ARDStatsBuilder.m',
+            'examples/objc/AppRTCDemo/ARDStatsBuilder.m',
-            'examples/objc/AppRTCMobile/ARDTURNClient.h',
+            'examples/objc/AppRTCDemo/ARDTURNClient.h',
-            'examples/objc/AppRTCMobile/ARDWebSocketChannel.h',
+            'examples/objc/AppRTCDemo/ARDWebSocketChannel.h',
-            'examples/objc/AppRTCMobile/ARDWebSocketChannel.m',
+            'examples/objc/AppRTCDemo/ARDWebSocketChannel.m',
-            'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h',
+            'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h',
-            'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m',
+            'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m',
-            'examples/objc/AppRTCMobile/RTCIceServer+JSON.h',
+            'examples/objc/AppRTCDemo/RTCIceServer+JSON.h',
-            'examples/objc/AppRTCMobile/RTCIceServer+JSON.m',
+            'examples/objc/AppRTCDemo/RTCIceServer+JSON.m',
-            'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h',
+            'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h',
-            'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m',
+            'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m',
-            'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h',
+            'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h',
-            'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m',
+            'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m',
           ],
           'include_dirs': [
-            'examples/objc/AppRTCMobile',
+            'examples/objc/AppRTCDemo',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCMobile',
+              'examples/objc/AppRTCDemo',
             ],
           },
           'export_dependent_settings': [
@@ -272,9 +272,9 @@
           },
         },
         {
-          'target_name': 'AppRTCMobile',
+          'target_name': 'AppRTCDemo',
           'type': 'executable',
-          'product_name': 'AppRTCMobile',
+          'product_name': 'AppRTCDemo',
           'mac_bundle': 1,
           'dependencies': [
             'apprtc_common',
@@ -283,41 +283,41 @@
           'conditions': [
             ['OS=="ios"', {
               'mac_bundle_resources': [
-                'examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf',
+                'examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf',
-                'examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png',
+                'examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png',
-                'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png',
+                'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png',
-                'examples/objc/AppRTCMobile/ios/resources/mozart.mp3',
+                'examples/objc/AppRTCDemo/ios/resources/mozart.mp3',
                 'examples/objc/Icon.png',
               ],
               'sources': [
-                'examples/objc/AppRTCMobile/ios/ARDAppDelegate.h',
+                'examples/objc/AppRTCDemo/ios/ARDAppDelegate.h',
-                'examples/objc/AppRTCMobile/ios/ARDAppDelegate.m',
+                'examples/objc/AppRTCDemo/ios/ARDAppDelegate.m',
-                'examples/objc/AppRTCMobile/ios/ARDMainView.h',
+                'examples/objc/AppRTCDemo/ios/ARDMainView.h',
-                'examples/objc/AppRTCMobile/ios/ARDMainView.m',
+                'examples/objc/AppRTCDemo/ios/ARDMainView.m',
-                'examples/objc/AppRTCMobile/ios/ARDMainViewController.h',
+                'examples/objc/AppRTCDemo/ios/ARDMainViewController.h',
-                'examples/objc/AppRTCMobile/ios/ARDMainViewController.m',
+                'examples/objc/AppRTCDemo/ios/ARDMainViewController.m',
-                'examples/objc/AppRTCMobile/ios/ARDStatsView.h',
+                'examples/objc/AppRTCDemo/ios/ARDStatsView.h',
-                'examples/objc/AppRTCMobile/ios/ARDStatsView.m',
+                'examples/objc/AppRTCDemo/ios/ARDStatsView.m',
-                'examples/objc/AppRTCMobile/ios/ARDVideoCallView.h',
+                'examples/objc/AppRTCDemo/ios/ARDVideoCallView.h',
-                'examples/objc/AppRTCMobile/ios/ARDVideoCallView.m',
+                'examples/objc/AppRTCDemo/ios/ARDVideoCallView.m',
-                'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h',
+                'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h',
-                'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m',
+                'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m',
-                'examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch',
+                'examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch',
-                'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h',
+                'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h',
-                'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m',
+                'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m',
-                'examples/objc/AppRTCMobile/ios/main.m',
+                'examples/objc/AppRTCDemo/ios/main.m',
               ],
               'xcode_settings': {
-                'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/ios/Info.plist',
+                'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/ios/Info.plist',
                 'WARNING_CFLAGS':  [
                   # Suppress compiler warnings about deprecated that triggered
                   # when moving from ios_deployment_target 7.0 to 9.0.
@@ -328,15 +328,15 @@
             }],
             ['OS=="mac"', {
               'sources': [
-                'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h',
+                'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h',
-                'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m',
+                'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m',
-                'examples/objc/AppRTCMobile/mac/APPRTCViewController.h',
+                'examples/objc/AppRTCDemo/mac/APPRTCViewController.h',
-                'examples/objc/AppRTCMobile/mac/APPRTCViewController.m',
+                'examples/objc/AppRTCDemo/mac/APPRTCViewController.m',
-                'examples/objc/AppRTCMobile/mac/main.m',
+                'examples/objc/AppRTCDemo/mac/main.m',
               ],
               'xcode_settings': {
                 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
-                'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/mac/Info.plist',
+                'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/mac/Info.plist',
                 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
                 'OTHER_LDFLAGS': [
                   '-framework AVFoundation',
@@ -352,15 +352,15 @@
           'xcode_settings': {
             'CLANG_ENABLE_OBJC_ARC': 'YES',
           },
-        },  # target AppRTCMobile
+        },  # target AppRTCDemo
         {
           # TODO(tkchin): move this into the real third party location and
           # have it mirrored on chrome infra.
           'target_name': 'socketrocket',
           'type': 'static_library',
           'sources': [
-            'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h',
+            'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h',
-            'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m',
+            'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m',
           ],
           'conditions': [
             ['OS=="mac"', {
@@ -382,7 +382,7 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCMobile/third_party/SocketRocket',
+              'examples/objc/AppRTCDemo/third_party/SocketRocket',
             ],
           },
           'xcode_settings': {
@@ -407,13 +407,13 @@
     ['OS=="android"', {
       'targets': [
         {
-          'target_name': 'AppRTCMobile',
+          'target_name': 'AppRTCDemo',
           'type': 'none',
           'dependencies': [
             'api/api_java.gyp:libjingle_peerconnection_java',
           ],
           'variables': {
-            'apk_name': 'AppRTCMobile',
+            'apk_name': 'AppRTCDemo',
             'java_in_dir': 'examples/androidapp',
             'has_java_resources': 1,
             'resource_dir': 'examples/androidapp/res',
@@ -429,31 +429,31 @@
             'add_to_dependents_classpaths':1,
           },
           'includes': [ '../build/java_apk.gypi' ],
-        },  # target AppRTCMobile
+        },  # target AppRTCDemo
 
         {
-          # AppRTCMobile creates a .jar as a side effect. Any java targets
+          # AppRTCDemo creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
-          # AppRTCMobile_apk. Dependents of AppRTCMobile_apk receive its
+          # AppRTCDemo_apk. Dependents of AppRTCDemo_apk receive its
           # jar path in the variable 'apk_output_jar_path'.
           # This target should only be used by targets which instrument
-          # AppRTCMobile_apk.
+          # AppRTCDemo_apk.
-          'target_name': 'AppRTCMobile_apk',
+          'target_name': 'AppRTCDemo_apk',
           'type': 'none',
           'dependencies': [
-             'AppRTCMobile',
+             'AppRTCDemo',
            ],
            'includes': [ '../build/apk_fake_jar.gypi' ],
-        },  # target AppRTCMobile_apk
+        },  # target AppRTCDemo_apk
 
         {
-          'target_name': 'AppRTCMobileTest',
+          'target_name': 'AppRTCDemoTest',
           'type': 'none',
           'dependencies': [
-            'AppRTCMobile_apk',
+            'AppRTCDemo_apk',
            ],
           'variables': {
-            'apk_name': 'AppRTCMobileTest',
+            'apk_name': 'AppRTCDemoTest',
             'java_in_dir': 'examples/androidtests',
             'is_test_apk': 1,
             'test_type': 'instrumentation',