8 files changed, 0 insertions, 72 deletions
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 0151136..f05421c 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -105,9 +105,6 @@ source_set("extensions") {
         rebase_path(gypi_values.chrome_browser_extensions_non_chromeos_sources,
                     ".",
                     "//chrome")
-    if (is_android) {
-      sources -= [ "api/messaging/native_process_launcher_posix.cc" ]
-    }
   }
 
   if (enable_service_discovery) {
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_android.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_android.cc
deleted file mode 100644
index d6c1b17..0000000
--- a/chrome/browser/extensions/api/messaging/native_process_launcher_android.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 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/browser/extensions/api/messaging/native_process_launcher.h"
-
-namespace extensions {
-
-// static
-base::FilePath NativeProcessLauncher::FindManifest(
-    const std::string& host_name,
-    bool allow_user_level_hosts,
-    std::string* error_message) {
-  return base::FilePath();
-}
-
-// static
-bool NativeProcessLauncher::LaunchNativeProcess(
-    const base::CommandLine& command_line,
-    base::Process* process,
-    base::File* read_file,
-    base::File* write_file) {
-  return false;
-}
-
-}  // namespace extensions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 04b53e7..2689005 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -68,7 +68,6 @@
       'browser/extensions/api/messaging/native_message_process_host.h',
       'browser/extensions/api/messaging/native_process_launcher.cc',
       'browser/extensions/api/messaging/native_process_launcher.h',
-      'browser/extensions/api/messaging/native_process_launcher_android.cc',
       'browser/extensions/api/messaging/native_process_launcher_posix.cc',
       'browser/extensions/api/messaging/native_process_launcher_win.cc',
     ],
diff --git a/extensions/browser/api/serial/serial_api.cc b/extensions/browser/api/serial/serial_api.cc
index d80008e4..0d477be 100644
--- a/extensions/browser/api/serial/serial_api.cc
+++ b/extensions/browser/api/serial/serial_api.cc
@@ -86,14 +86,11 @@ bool SerialGetDevicesFunction::Prepare() {
 void SerialGetDevicesFunction::Work() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
-// TODO(moshayedi): crbug.com/549257. Add USB support for Aura on Android.
-#if !defined(OS_ANDROID)
   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
       device::SerialDeviceEnumerator::Create();
   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
   results_ = serial::GetDevices::Results::Create(
       devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
-#endif
 }
 
 SerialConnectFunction::SerialConnectFunction() {
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 1b146fa..d692e02 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -134,9 +134,6 @@ static std::string TerminationStatusToString(base::TerminationStatus status) {
 #endif
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
       return "killed";
-#if defined(OS_ANDROID)
-    case base::TERMINATION_STATUS_OOM_PROTECTED:
-#endif
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
       return "crashed";
     case base::TERMINATION_STATUS_LAUNCH_FAILED:
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index 4f5496a..b0f40b5 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -71,15 +71,6 @@ if (enable_extensions) {
       "//url",
     ]
 
-    if (is_android) {
-      deps -= [ "//device/usb" ]
-      sources -= [
-        "api/printer_provider/usb_printer_manifest_data.cc",
-        "api/printer_provider/usb_printer_manifest_data.h",
-        "api/printer_provider/usb_printer_manifest_handler.cc",
-      ]
-    }
-
     if (enable_nacl) {
       nacl_sources =
           rebase_path(extensions_gypi_values.extensions_common_sources_nacl,
diff --git a/extensions/common/api/printer_provider/usb_printer_manifest_handler_android.cc b/extensions/common/api/printer_provider/usb_printer_manifest_handler_android.cc
deleted file mode 100644
index 88861c4..0000000
--- a/extensions/common/api/printer_provider/usb_printer_manifest_handler_android.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 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/common/api/printer_provider/usb_printer_manifest_handler.h"
-
-#include "extensions/common/extension.h"
-
-namespace extensions {
-
-UsbPrinterManifestHandler::UsbPrinterManifestHandler() {
-}
-
-UsbPrinterManifestHandler::~UsbPrinterManifestHandler() {
-}
-
-bool UsbPrinterManifestHandler::Parse(Extension* extension,
-                                      base::string16* error) {
-  return false;
-}
-
-const std::vector<std::string> UsbPrinterManifestHandler::Keys() const {
-  return std::vector<std::string>();
-}
-
-}  // namespace extensions
diff --git a/extensions/extensions.gypi b/extensions/extensions.gypi
index 6049ecb..9128d49 100644
--- a/extensions/extensions.gypi
+++ b/extensions/extensions.gypi
@@ -30,7 +30,6 @@
       'common/api/printer_provider/usb_printer_manifest_data.cc',
       'common/api/printer_provider/usb_printer_manifest_data.h',
       'common/api/printer_provider/usb_printer_manifest_handler.cc',
-      'common/api/printer_provider/usb_printer_manifest_handler_android.cc',
       'common/api/printer_provider/usb_printer_manifest_handler.h',
       'common/api/sockets/sockets_manifest_data.cc',
       'common/api/sockets/sockets_manifest_data.h',