Index: chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
diff --git a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
index 8dfb32c9afd5bcad591520b09f4ae9fbadb66147..1de8a2903649f52c729876d0e90d7e77976fef66 100644 |
--- a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
+++ b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
@@ -8,7 +8,6 @@ |
#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" |
@@ -20,7 +19,6 @@ |
#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" |
@@ -96,19 +94,15 @@ struct BuiltInHost { |
}; |
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 |