Remove --enable-remoting flag.

chrome/common/chrome_content_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 102 matching lines @@
       webkit::npapi::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
                                                       kNaClPluginExtension,
                                                       kNaClPluginDescription);
       nacl.mime_types.push_back(nacl_mime_type);
       plugins->push_back(nacl);
 
       skip_nacl_file_check = true;
     }
   }
 
-  // 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;
+  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);
-  }
+  plugins->push_back(info);
 #endif
 }
 
 void AddOutOfProcessFlash(std::vector<PepperPluginInfo>* plugins) {
   // Flash being out of process is handled separately than general plugins
   // for testing purposes.
   bool flash_out_of_process = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kPpapiFlashInProcess);
 
   // Handle any Pepper Flash first.
@@ skipping 214 matching lines @@
     policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
     policy->SetTokenLevel(
         sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
   }
 
   return true;
 }
 #endif
 
 }  // namespace chrome