Removing references to //ppapi when is_android = true

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 674f7cf51752538cc4e6f470228390bb725592d6..f27a19a709b2be638f21c64731507f27c83e4313 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -80,11 +80,6 @@ source_set("test_support") {
       "//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",
@@ -93,7 +88,14 @@ source_set("test_support") {
     ]
 
     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) {
@@ -382,10 +384,6 @@ test("content_browsertests") {
     "//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",
@@ -408,10 +406,19 @@ test("content_browsertests") {
   ]
 
   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,