Mandoline: Merge Surfaces and Views apps

components/view_manager/BUILD.gn

Index: components/view_manager/BUILD.gn
diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index a7544be93a062f938dec5efcbd2eb8b19d206c50..01c684eb0b5ef7f0c4caa3114eac58cc096f8ab5 100644
--- a/components/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
@@ -14,7 +14,6 @@ if (is_android) {
     deps = [
       ":lib",
       ":loader",
-      "native_viewport",
     ]
   }
 
@@ -40,7 +39,7 @@ if (is_android) {
       ":lib",
       "//base",
       "//components/view_manager/public/interfaces",
-      "//components/view_manager/native_viewport",
+      "//components/view_manager/surfaces",
       "//mojo/application/public/cpp",
       "//mojo/converters/geometry",
       "//mojo/environment:chromium",
@@ -50,8 +49,6 @@ if (is_android) {
       "//ui/events/platform",
       "//ui/gl",
     ]
-
-    data_deps = [ "//components/view_manager/surfaces" ]
   }
 }
 
@@ -119,7 +116,7 @@ source_set("lib") {
     "//cc/surfaces:surface_id",
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
-    "//components/view_manager/native_viewport",
+    "//components/view_manager/surfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",