Mojo: Get rid of some unneeded namespace qualifiers in mojo/embedder/.

R=darin@chromium.org

Review URL: https://codereview.chromium.org/472903002

Cr-Commit-Position: refs/heads/master@{#289627}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289627 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 14 deletions

diff --git a/mojo/embedder/channel_init.cc b/mojo/embedder/channel_init.cc
index 2da9bcd..31cb500 100644
--- a/mojo/embedder/channel_init.cc
+++ b/mojo/embedder/channel_init.cc
@@ -19,20 +19,18 @@ ChannelInit::~ChannelInit() {
     DestroyChannel(channel_info_);
 }
 
-mojo::ScopedMessagePipeHandle ChannelInit::Init(
+ScopedMessagePipeHandle ChannelInit::Init(
     base::PlatformFile file,
     scoped_refptr<base::TaskRunner> io_thread_task_runner) {
   DCHECK(!io_thread_task_runner_.get());  // Should only init once.
   io_thread_task_runner_ = io_thread_task_runner;
-  mojo::ScopedMessagePipeHandle message_pipe =
-      mojo::embedder::CreateChannel(
-          mojo::embedder::ScopedPlatformHandle(
-              mojo::embedder::PlatformHandle(file)),
-          io_thread_task_runner,
-          base::Bind(&ChannelInit::OnCreatedChannel,
-                     weak_factory_.GetWeakPtr(),
-                     io_thread_task_runner),
-          base::MessageLoop::current()->message_loop_proxy()).Pass();
+  ScopedMessagePipeHandle message_pipe =
+      CreateChannel(ScopedPlatformHandle(PlatformHandle(file)),
+                    io_thread_task_runner,
+                    base::Bind(&ChannelInit::OnCreatedChannel,
+                               weak_factory_.GetWeakPtr(),
+                               io_thread_task_runner),
+                    base::MessageLoop::current()->message_loop_proxy()).Pass();
   return message_pipe.Pass();
 }
 
@@ -44,7 +42,7 @@ void ChannelInit::WillDestroySoon() {
 // static
 void ChannelInit::OnCreatedChannel(base::WeakPtr<ChannelInit> self,
                                    scoped_refptr<base::TaskRunner> io_thread,
-                                   embedder::ChannelInfo* channel) {
+                                   ChannelInfo* channel) {
   // If |self| was already destroyed, shut the channel down.
   if (!self) {
     DestroyChannel(channel);
diff --git a/mojo/embedder/channel_init.h b/mojo/embedder/channel_init.h
index 00337c5..26a6452 100644
--- a/mojo/embedder/channel_init.h
+++ b/mojo/embedder/channel_init.h
@@ -45,12 +45,12 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelInit {
   // since we want to destroy the channel even if we're destroyed.)
   static void OnCreatedChannel(base::WeakPtr<ChannelInit> self,
                                scoped_refptr<base::TaskRunner> io_thread,
-                               embedder::ChannelInfo* channel);
+                               ChannelInfo* channel);
 
   scoped_refptr<base::TaskRunner> io_thread_task_runner_;
 
   // If non-null the channel has been established.
-  embedder::ChannelInfo* channel_info_;
+  ChannelInfo* channel_info_;
 
   base::WeakPtrFactory<ChannelInit> weak_factory_;
 
diff --git a/mojo/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
index bc32213..afe608e 100644
--- a/mojo/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_unittest.cc
@@ -456,7 +456,7 @@ TEST_F(EmbedderTest, MultiprocessChannels) {
 }
 
 MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
-  embedder::ScopedPlatformHandle client_platform_handle =
+  ScopedPlatformHandle client_platform_handle =
       mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
   EXPECT_TRUE(client_platform_handle.is_valid());