Update includes to account for network service move

majido · Oct 19, 2015 · edb7d79 · edb7d79
1 parent 72aca71
commit edb7d79
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/mojo/dart/embedder/BUILD.gn b/mojo/dart/embedder/BUILD.gn
@@ -39,7 +39,6 @@ source_set("dart_controller_no_snapshot") {
     "//mojo/public/c/system",
     "//mojo/public/cpp/system",
     "//mojo/services/network/interfaces",
-    "//tonic",
   ]
 
   defines = []

diff --git a/services/sky/BUILD.gn b/services/sky/BUILD.gn
@@ -41,7 +41,7 @@ mojo_native_application("sky") {
     "//mojo/services/gpu/interfaces",
     "//mojo/services/input_events/interfaces",
     "//mojo/services/navigation/interfaces",
-    "//mojo/services/network/public/interfaces",
+    "//mojo/services/network/interfaces",
     "//mojo/services/service_registry/interfaces",
     "//mojo/services/surfaces/interfaces",
     "//mojo/services/view_manager/cpp",

diff --git a/services/sky/content_handler_impl.cc b/services/sky/content_handler_impl.cc
@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "services/sky/document_view.h"
 
 namespace sky {

diff --git a/services/sky/document_view.h b/services/sky/document_view.h
@@ -15,7 +15,7 @@
 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
 #include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/services/network/interfaces/url_loader.mojom.h"
 #include "mojo/services/service_registry/interfaces/service_registry.mojom.h"
 #include "mojo/services/surfaces/interfaces/display.mojom.h"
 #include "services/sky/compositor/layer_client.h"

diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
@@ -550,7 +550,7 @@ source_set("platform") {
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
-    "//mojo/services/network/public/interfaces",
+    "//mojo/services/network/interfaces",
     "//skia",
     "//sky/engine/wtf",
     "//third_party/harfbuzz-ng",

diff --git a/sky/engine/public/sky/BUILD.gn b/sky/engine/public/sky/BUILD.gn
@@ -6,7 +6,7 @@ source_set("sky") {
   deps = [
     "//base",
     "//mojo/public/cpp/system",
-    "//mojo/services/network/public/interfaces",
+    "//mojo/services/network/interfaces",
     "//skia",
     "//sky/compositor",
     "//sky/engine/core",

diff --git a/sky/engine/public/sky/sky_view.h b/sky/engine/public/sky/sky_view.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/services/network/interfaces/url_loader.mojom.h"
 #include "sky/compositor/layer_tree.h"
 #include "sky/engine/public/platform/WebCommon.h"
 #include "sky/engine/public/platform/WebURL.h"

diff --git a/sky/services/ns_net/BUILD.gn b/sky/services/ns_net/BUILD.gn
@@ -13,6 +13,6 @@ source_set("ns_net") {
   deps = [
     "//base:base",
     "//mojo/public/cpp/application",
-    "//mojo/services/network/public/interfaces",
+    "//mojo/services/network/interfaces",
   ]
 }
diff --git a/sky/services/ns_net/network_service_impl.h b/sky/services/ns_net/network_service_impl.h
@@ -4,7 +4,7 @@
 
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
 
 namespace mojo {
 

diff --git a/sky/services/ns_net/url_loader_impl.h b/sky/services/ns_net/url_loader_impl.h
@@ -4,7 +4,7 @@
 
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/services/network/interfaces/url_loader.mojom.h"
 
 namespace mojo {
 

diff --git a/sky/services/oknet/BUILD.gn b/sky/services/oknet/BUILD.gn
@@ -16,7 +16,7 @@ android_library("oknet") {
     "//mojo/public/interfaces/network:network_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
-    "//mojo/services/network/public/interfaces:interfaces_java",
+    "//mojo/services/network/interfaces:interfaces_java",
     "//third_party/okhttp",
     "//third_party/okhttp:okio",
   ]

diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn
@@ -15,7 +15,7 @@ common_deps = [
   "//mojo/services/asset_bundle/interfaces",
   "//mojo/services/keyboard/interfaces",
   "//mojo/services/navigation/interfaces",
-  "//mojo/services/network/public/interfaces",
+  "//mojo/services/network/interfaces",
   "//services/asset_bundle:lib",
   "//skia",
   "//sky/compositor",
@@ -142,7 +142,7 @@ if (is_android) {
       "//mojo/public/java:bindings",
       "//mojo/public/java:system",
       "//mojo/services/keyboard/interfaces:interfaces_java",
-      "//mojo/services/network/public/interfaces:interfaces_java",
+      "//mojo/services/network/interfaces:interfaces_java",
       "//mojo/services/sensors/interfaces:interfaces_java",
       "//services/keyboard",
       "//services/sensors:sensors_lib",

diff --git a/sky/shell/dart/BUILD.gn b/sky/shell/dart/BUILD.gn
@@ -16,7 +16,7 @@ source_set("dart") {
     "//dart/runtime:libdart",
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/application",
-    "//mojo/services/network/public/interfaces",
+    "//mojo/services/network/interfaces",
     "//sky/engine/tonic",
     "//sky/engine/wtf",
     "//url",

diff --git a/sky/shell/dart/dart_library_provider_network.h b/sky/shell/dart/dart_library_provider_network.h
@@ -5,7 +5,7 @@
 #ifndef SKY_SHELL_DART_DART_LIBRARY_PROVIDER_NETWORK_H_
 #define SKY_SHELL_DART_DART_LIBRARY_PROVIDER_NETWORK_H_
 
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "sky/engine/tonic/dart_library_provider.h"
 #include "sky/engine/wtf/HashSet.h"
 #include "sky/engine/wtf/OwnPtr.h"

diff --git a/sky/shell/ui/engine.h b/sky/shell/ui/engine.h
@@ -16,7 +16,7 @@
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
 #include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "skia/ext/refptr.h"
 #include "sky/engine/public/platform/ServiceProvider.h"
 #include "sky/engine/public/sky/sky_view.h"