8 files changed, 6 insertions, 8 deletions
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index dcbdaf2..484b96f 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -156,7 +156,6 @@ source_set("lib") {
     "//mojo/cc",
     "//mojo/common",
     "//mojo/converters/surfaces",
-    "//mojo/message_pump",
     "//mojo/platform_handle",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
diff --git a/components/html_viewer/DEPS b/components/html_viewer/DEPS
index 8355e5b..7c58938 100644
--- a/components/html_viewer/DEPS
+++ b/components/html_viewer/DEPS
@@ -21,7 +21,6 @@ include_rules = [
   "+mojo/common",
   "+mojo/converters/geometry",
   "+mojo/converters/surfaces",
-  "+mojo/message_pump",
   "+mojo/platform_handle",
   "+mojo/public",
   "+mojo/services/network",
diff --git a/components/html_viewer/web_socket_handle_impl.h b/components/html_viewer/web_socket_handle_impl.h
index 9929748..6487642 100644
--- a/components/html_viewer/web_socket_handle_impl.h
+++ b/components/html_viewer/web_socket_handle_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/message_pump/handle_watcher.h"
+#include "mojo/common/handle_watcher.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
 #include "third_party/WebKit/public/platform/WebSocketHandle.h"
 
diff --git a/components/html_viewer/web_url_loader_impl.h b/components/html_viewer/web_url_loader_impl.h
index 9acc027..7ff3a43 100644
--- a/components/html_viewer/web_url_loader_impl.h
+++ b/components/html_viewer/web_url_loader_impl.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/html_viewer/mock_web_blob_registry_impl.h"
-#include "mojo/message_pump/handle_watcher.h"
+#include "mojo/common/handle_watcher.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "third_party/WebKit/public/platform/WebBlobData.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
diff --git a/components/message_port.gypi b/components/message_port.gypi
index 7891058..498405e 100644
--- a/components/message_port.gypi
+++ b/components/message_port.gypi
@@ -9,7 +9,7 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../mojo/mojo_base.gyp:mojo_message_pump_lib',
+        '../mojo/mojo_base.gyp:mojo_common_lib',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/mojo/mojo_public.gyp:mojo_system_cpp_headers',
       ],
diff --git a/components/message_port/BUILD.gn b/components/message_port/BUILD.gn
index 63c7da1..3a81750 100644
--- a/components/message_port/BUILD.gn
+++ b/components/message_port/BUILD.gn
@@ -10,7 +10,7 @@ source_set("message_port") {
 
   public_deps = [
     "//base",
-    "//mojo/message_pump",
+    "//mojo/common",
     "//third_party/WebKit/public:blink",
     "//third_party/mojo/src/mojo/public/cpp/system",
   ]
diff --git a/components/message_port/DEPS b/components/message_port/DEPS
index 4f27eb3..eba876f 100644
--- a/components/message_port/DEPS
+++ b/components/message_port/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+base",
-  "+mojo/message_pump",
+  "+mojo/common",
   "+third_party/WebKit/public",
   "+third_party/mojo/src/mojo/public/cpp/system",
 ]
diff --git a/components/message_port/web_message_port_channel_impl.h b/components/message_port/web_message_port_channel_impl.h
index 12d6c28..49fe97e 100644
--- a/components/message_port/web_message_port_channel_impl.h
+++ b/components/message_port/web_message_port_channel_impl.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_MESSAGE_PORT_WEB_MESSAGE_PORT_CHANNEL_IMPL_H_
 
 #include "base/basictypes.h"
-#include "mojo/message_pump/handle_watcher.h"
+#include "mojo/common/handle_watcher.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"