Remove --enable-remoting flag.

BUG=91256
TEST=None

Review URL: http://codereview.chromium.org/7545018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94996 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 29 deletions

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 64fca21..1adc397 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -120,31 +120,28 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
     }
   }
 
-  // The Remoting Viewer plugin is built-in, but behind a flag for now.
+  // The Remoting Viewer plugin is built-in.
 #if defined(ENABLE_REMOTING)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableRemoting)) {
-    PepperPluginInfo info;
-    info.is_internal = true;
-    info.name = kRemotingViewerPluginName;
-    info.path = FilePath(kRemotingViewerPluginPath);
-    webkit::npapi::WebPluginMimeType remoting_mime_type(
-        kRemotingViewerPluginMimeType,
-        std::string(),
-        std::string());
-    info.mime_types.push_back(remoting_mime_type);
-    webkit::npapi::WebPluginMimeType old_remoting_mime_type(
-        kRemotingViewerPluginOldMimeType,
-        std::string(),
-        std::string());
-    info.mime_types.push_back(old_remoting_mime_type);
-    info.internal_entry_points.get_interface = remoting::PPP_GetInterface;
-    info.internal_entry_points.initialize_module =
-        remoting::PPP_InitializeModule;
-    info.internal_entry_points.shutdown_module = remoting::PPP_ShutdownModule;
-
-    plugins->push_back(info);
-  }
+  PepperPluginInfo info;
+  info.is_internal = true;
+  info.name = kRemotingViewerPluginName;
+  info.path = FilePath(kRemotingViewerPluginPath);
+  webkit::npapi::WebPluginMimeType remoting_mime_type(
+      kRemotingViewerPluginMimeType,
+      std::string(),
+      std::string());
+  info.mime_types.push_back(remoting_mime_type);
+  webkit::npapi::WebPluginMimeType old_remoting_mime_type(
+      kRemotingViewerPluginOldMimeType,
+      std::string(),
+      std::string());
+  info.mime_types.push_back(old_remoting_mime_type);
+  info.internal_entry_points.get_interface = remoting::PPP_GetInterface;
+  info.internal_entry_points.initialize_module =
+      remoting::PPP_InitializeModule;
+  info.internal_entry_points.shutdown_module = remoting::PPP_ShutdownModule;
+
+  plugins->push_back(info);
 #endif
 }
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 99ffb5a..1db0e04 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -472,10 +472,6 @@ const char kEnableNaClDebug[]               = "enable-nacl-debug";
 // Enables TLS origin bound certificate extension.
 const char kEnableOriginBoundCerts[]  = "enable-origin-bound-certs";
 
-// This applies only when the process type is "service". Enables the
-// Chromoting Host Process within the service process.
-const char kEnableRemoting[]                = "enable-remoting";
-
 // Enable content settings based on host *and* plug-in.
 const char kEnableResourceContentSettings[] =
     "enable-resource-content-settings";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5a27b07..6b0c375 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -139,7 +139,6 @@ extern const char kEnableNaClDebug[];
 extern const char kEnableOriginBoundCerts[];
 extern const char kEnablePanels[];
 extern const char kEnablePreconnect[];
-extern const char kEnableRemoting[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
 extern const char kEnableShortcutsProvider[];