Remove flag for Remote Assistance on Chrome OS

chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc

 // Copyright 2014 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 "extensions/browser/api/messaging/native_message_host.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h"
 #include "components/policy/core/common/policy_service.h"
 #include "extensions/common/constants.h"
-#include "extensions/common/switches.h"
 #include "extensions/common/url_pattern.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
@@ skipping 55 matching lines @@
 };
 
 struct BuiltInHost {
   const char* const name;
   const char* const* const allowed_origins;
   int allowed_origins_count;
   scoped_ptr<NativeMessageHost>(*create_function)();
 };
 
 scoped_ptr<NativeMessageHost> CreateIt2MeHost() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRemoteAssistance)) {
-    scoped_ptr<remoting::It2MeHostFactory> host_factory(
-        new remoting::It2MeHostFactory());
-    host_factory->set_policy_service(g_browser_process->policy_service());
-    scoped_ptr<remoting::ChromotingHostContext> context =
-        remoting::ChromotingHostContext::CreateForChromeOS(
-            make_scoped_refptr(g_browser_process->system_request_context()));
-    scoped_ptr<NativeMessageHost> host(new remoting::It2MeNativeMessagingHost(
-        context.Pass(), host_factory.Pass()));
-    return host.Pass();
-  }
-  return nullptr;
+  scoped_ptr<remoting::It2MeHostFactory> host_factory(
+      new remoting::It2MeHostFactory());
+  host_factory->set_policy_service(g_browser_process->policy_service());
+  scoped_ptr<remoting::ChromotingHostContext> context =
+      remoting::ChromotingHostContext::CreateForChromeOS(
+          make_scoped_refptr(g_browser_process->system_request_context()));
+  scoped_ptr<NativeMessageHost> host(new remoting::It2MeNativeMessagingHost(
+      context.Pass(), host_factory.Pass()));
+  return host.Pass();
 }
 
 // If you modify the list of allowed_origins, don't forget to update
 // remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2
 // to keep the two lists in sync.
 // TODO(kelvinp): Load the native messaging manifest as a resource file into
 // chrome and fetch the list of allowed_origins from the manifest (see
 // crbug/424743).
 const char* const kRemotingIt2MeOrigins[] = {
     "chrome-extension://ljacajndfccfgnfohlgkdphmbnpkjflk/",
@@ skipping 44 matching lines @@
       }
       *error = kForbiddenError;
       return nullptr;
     }
   }
   *error = kNotFoundError;
   return nullptr;
 }
 
 }  // namespace extensions