Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone"

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"
+#if defined(USE_X11)
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
+# endif  // defined(USE_X11)
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 // A simple NativeMessageHost that mimics the implementation of
 // chrome/test/data/native_messaging/native_hosts/echo.py. It is currently
 // used for testing by ExtensionApiTest::NativeMessagingBasic.
@@ skipping 50 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EchoHost);
 };
 
 struct BuiltInHost {
   const char* const name;
   const char* const* const allowed_origins;
   int allowed_origins_count;
   scoped_ptr<NativeMessageHost>(*create_function)();
 };
 
+// Remote assistance currently only supports X11.
+// TODO(kelvinp): Migrate to ozone once it is ready (crbug.com/426716).
+#if defined(USE_X11)
 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(
@@ skipping 10 matching lines @@
 // chrome and fetch the list of allowed_origins from the manifest (see
 // crbug/424743).
 const char* const kRemotingIt2MeOrigins[] = {
     "chrome-extension://ljacajndfccfgnfohlgkdphmbnpkjflk/",
     "chrome-extension://gbchcmhmhahfdphkhkmpfmihenigjmpp/",
     "chrome-extension://kgngmbheleoaphbjbaiobfdepmghbfah/",
     "chrome-extension://odkaodonbgfohohmklejpjiejmcipmib/",
     "chrome-extension://dokpleeekgeeiehdhmdkeimnkmoifgdd/",
     "chrome-extension://ajoainacpilcemgiakehflpbkbfipojk/",
     "chrome-extension://hmboipgjngjoiaeicfdifdoeacilalgc/"};
+#endif  // defined(USE_X11)
 
 static const BuiltInHost kBuiltInHost[] = {
     {"com.google.chrome.test.echo", // ScopedTestNativeMessagingHost::kHostName
      kEchoHostOrigins,
      arraysize(kEchoHostOrigins),
      &EchoHost::Create},
+#if defined(USE_X11)
      {"com.google.chrome.remote_assistance",
      kRemotingIt2MeOrigins,
      arraysize(kRemotingIt2MeOrigins),
      &CreateIt2MeHost},
+#endif  // defined(USE_X11)
 };
 
 bool MatchesSecurityOrigin(const BuiltInHost& host,
                            const std::string& extension_id) {
   GURL origin(std::string(kExtensionScheme) + "://" + extension_id);
   for (int i = 0; i < host.allowed_origins_count; i++) {
     URLPattern allowed_origin(URLPattern::SCHEME_ALL, host.allowed_origins[i]);
     if (allowed_origin.MatchesSecurityOrigin(origin)) {
       return true;
     }
@@ skipping 18 matching lines @@
       }
       *error = kForbiddenError;
       return nullptr;
     }
   }
   *error = kNotFoundError;
   return nullptr;
 }
 
 }  // namespace extensions