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

This reverts commit 18ffa03.

It broke ChromiumOS GN.

R=kelvinp@chromium.org

Review URL: https://codereview.chromium.org/718313002

Cr-Commit-Position: refs/heads/master@{#303972}

chrome/browser/extensions/BUILD.gn

@@ -229,6 +229,9 @@ static_library("extensions") {
     sources -= [
       "global_shortcut_listener_chromeos.cc",
     ]
+    deps -= [
+      "//remoting/host/it2me:common",
+    ]
   }
   if (!use_ozone) {
     sources -= [

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

@@ -23,8 +23,10 @@
 #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"
 
@@ -95,6 +97,9 @@ struct BuiltInHost {
   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)) {
@@ -125,16 +130,19 @@ const char* const kRemotingIt2MeOrigins[] = {
     "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,

chrome/chrome_browser_extensions.gypi

@@ -965,13 +965,19 @@
       ],
       'conditions': [
         ['chromeos==1', {
-          'include_dirs': [
-            '../third_party/libjingle/source',
+          'conditions': [
+            ['use_x11==1', {
+              'dependencies': [
+                '../remoting/remoting.gyp:remoting_it2me_host_static',
+              ],
+              'include_dirs': [
+                '../third_party/libjingle/source',
+              ],
+            }]
           ],
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../chromeos/ime/input_method.gyp:gencode',
-            '../remoting/remoting.gyp:remoting_it2me_host_static',
             '../third_party/libevent/libevent.gyp:libevent',
           ],
           'sources': [

remoting/host/BUILD.gn

@@ -30,7 +30,6 @@ static_library("host") {
     "//remoting/base",
     "//remoting/protocol",
     "//remoting/resources",
-    "//ui/events/platform",
     "//ui/events:dom4_keycode_converter",
   ]
 
@@ -44,11 +43,7 @@ static_library("host") {
       "//build/config/linux:x11",
     ]
   } else {
-    sources -= [
-      "clipboard_x11.cc",
-      "linux/x_server_clipboard.cc",
-      "linux/x_server_clipboard.h",
-    ]
+    sources -= [ "clipboard_x11.cc" ]
   }
 
   if (is_chromeos) {
@@ -68,30 +63,19 @@ static_library("host") {
       deps += [ "//ash" ]
     }
 
-    if (use_ozone) {
-      sources -= [
-        "input_injector_x11.cc",
-        "local_input_monitor_x11.cc",
-      ]
-    } else {
-      sources -= [
-        "chromeos/mouse_cursor_monitor_aura.cc",
-        "chromeos/mouse_cursor_monitor_aura.h",
-        "clipboard_x11.cc",
-        "input_injector_chromeos.cc",
-        "input_injector_chromeos.h",
-        "linux/x_server_clipboard.cc",
-        "linux/x_server_clipboard.h",
-        "local_input_monitor_chromeos.cc",
-      ]
-    }
-
     sources -= [
+      "clipboard_x11.cc",
       "continue_window_linux.cc",
       "disconnect_window_linux.cc",
       "policy_hack/policy_watcher_linux.cc",
       "remoting_me2me_host.cc",
     ]
+
+  } else {
+    sources -= [
+      "clipboard_aura.cc",
+      "clipboard_aura.h",
+    ]
   }
 
   if (is_mac) {

remoting/host/basic_desktop_environment.cc

@@ -11,9 +11,6 @@
 #if defined(OS_CHROMEOS)
 #include "remoting/host/chromeos/aura_desktop_capturer.h"
 #endif
-#if defined(OS_CHROMEOS) && defined(USE_OZONE)
-#include "remoting/host/chromeos/mouse_cursor_monitor_aura.h"
-#endif
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/gnubby_auth_handler.h"
 #include "remoting/host/input_injector.h"
@@ -48,13 +45,8 @@ scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() {
 
 scoped_ptr<webrtc::MouseCursorMonitor>
 BasicDesktopEnvironment::CreateMouseCursorMonitor() {
-#if defined(OS_CHROMEOS) && defined(USE_OZONE)
-  return make_scoped_ptr(
-      new MouseCursorMonitorAura(*desktop_capture_options_));
-#else
   return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen(
       *desktop_capture_options_, webrtc::kFullDesktopScreenId));
-#endif
 }
 
 std::string BasicDesktopEnvironment::GetCapabilities() const {

remoting/host/chromeos/clipboard_aura.cc → remoting/host/clipboard_aura.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/chromeos/clipboard_aura.h"
+#include "remoting/host/clipboard_aura.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"

remoting/host/chromeos/clipboard_aura_unittest.cc → remoting/host/clipboard_aura_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/chromeos/clipboard_aura.h"
+#include "remoting/host/clipboard_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"