Removing references to //ppapi when is_android = true

content/test/BUILD.gn

 # 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build_overrides/v8.gni")
 import("//media/media_options.gni")
@@ skipping 62 matching lines @@
       "//content/gpu",
       "//content/public/child",
       "//content/public/plugin",
       "//content/public/renderer",
       "//content/public/utility",
       "//content/shell:pak",
       "//ipc/mojo",
       "//media",
       "//mojo/application/public/cpp:cpp_for_chromium",
       "//mojo/environment:chromium",
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/proxy:test_support",
-      "//ppapi/shared_impl",
-      "//ppapi/shared_impl:test_support",
       "//storage/browser",
       "//storage/common",
       "//ui/compositor:test_support",
       "//ui/surface",
       "//v8",
     ]
 
     if (enable_plugins) {

[brettw, 2015/12/01 18:01:37]

I think this block should be moved out of the iOS block. It doesn't actually
have anything to do with iOS (or not), and iOS should always have plugins set to
disabled.

[agrieve, 2015/12/01 18:41:51]

Re-jiggerred these conditions to make the is_ios part as small as possible.

-      deps += [ "//content/ppapi_plugin" ]
+      deps += [
+        "//content/ppapi_plugin",
+        "//ppapi/host",
+        "//ppapi/proxy",
+        "//ppapi/proxy:test_support",
+        "//ppapi/shared_impl",
+        "//ppapi/shared_impl:test_support",
+      ]
     }
 
     if (enable_webrtc) {
       sources += [
         "../renderer/media/mock_data_channel_impl.cc",
         "../renderer/media/mock_data_channel_impl.h",
         "../renderer/media/mock_media_stream_dispatcher.cc",
         "../renderer/media/mock_media_stream_dispatcher.h",
         "../renderer/media/mock_peer_connection_impl.cc",
         "../renderer/media/mock_peer_connection_impl.h",
@@ skipping 268 matching lines @@
     "//media:shared_memory_support",
     "//media:test_support",
     "//media/audio:test_support",
     "//media/base:test_support",
     "//mojo/application/public/cpp:cpp_for_chromium",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js",
     "//mojo/test:test_support",
     "//net:test_support",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/proxy:ipc",
-    "//ppapi/shared_impl",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/public:blink",
     "//third_party/leveldatabase",
     "//third_party/mesa:osmesa",
     "//third_party/mojo/src/mojo/edk/system",
     "//third_party/mojo/src/mojo/edk/test:test_support",
     "//third_party/zlib",
     "//ui/accessibility",
     "//ui/accessibility:ax_gen",
     "//ui/base",
     "//ui/base/ime",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",
     "//ui/resources",
     "//ui/shell_dialogs",
     "//ui/snapshot",
   ]
 
   data_deps = [
-    "//ppapi:ppapi_tests",
     "//third_party/mesa:osmesa",
   ]
 
+  if (enable_plugins) {
+    deps += [
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
+    ]
+    data_deps += [ "//ppapi:ppapi_tests" ]
+  }
+
   if (is_win) {
     sources +=
         rebase_path(content_tests_gypi_values.content_browsertests_win_sources,
                     ".",
                     "//content")
 
     deps += [
       "//content/app/strings",
       "//net:net_resources",
       "//third_party/WebKit/public:resources",
@@ skipping 473 matching lines @@
         "//media/base/android",
         "//testing/gmock",
       ]
       apk_deps = [
         "//media/base/android:media_java",
         "//ui/android:ui_java",
       ]
     }
   }
 }