Mojo: Remove utility:: namespace

Public facing APIs should just live in the mojo:: namespace.

R=sky@chromium.org, viettrungluu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243799 0039d316-1c4b-4281-b951-d872f2087c98

mojo/examples/sample_app/sample_app.cc

@@ -62,7 +62,7 @@ class SampleApp : public ShellClient {
     }
 
     virtual void OnDestroyed() MOJO_OVERRIDE {
-      utility::RunLoop::current()->Quit();
+      RunLoop::current()->Quit();
     }
 
     virtual void OnEvent(const Event& event) MOJO_OVERRIDE {
@@ -85,8 +85,8 @@ class SampleApp : public ShellClient {
 
 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
     MojoHandle shell_handle) {
-  mojo::utility::Environment env;
-  mojo::utility::RunLoop loop;
+  mojo::Environment env;
+  mojo::RunLoop loop;
   MojoGLES2Initialize();
 
   mojo::examples::SampleApp app(

mojo/public/utility/bindings_support_impl.cc

@@ -12,7 +12,6 @@
 #include "mojo/public/utility/thread_local.h"
 
 namespace mojo {
-namespace utility {
 namespace internal {
 namespace {
 
@@ -109,5 +108,4 @@ void BindingsSupportImpl::CancelWait(AsyncWaitID async_wait_id) {
 }
 
 }  // namespace internal
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/bindings_support_impl.h

@@ -9,7 +9,6 @@
 #include "mojo/public/system/macros.h"
 
 namespace mojo {
-namespace utility {
 namespace internal {
 
 // BindingsSupport implementation that uses RunLoop. Before using this you must
@@ -40,7 +39,6 @@ class BindingsSupportImpl : public BindingsSupport {
 };
 
 }  // namespace internal
-}  // namespace utility
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_UTILITY_BINDINGS_SUPPORT_IMPL_H_

mojo/public/utility/bindings_support_impl_unittest.cc

@@ -12,7 +12,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace utility {
 namespace {
 
 class TestAsyncWaitCallback : public BindingsSupport::AsyncWaitCallback {
@@ -110,5 +109,4 @@ TEST_F(BindingsSupportImplTest, CancelCallback) {
 }
 
 }  // namespace
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/environment.cc

@@ -8,7 +8,6 @@
 #include "mojo/public/utility/run_loop.h"
 
 namespace mojo {
-namespace utility {
 
 Environment::Environment() : bindings_support_(NULL) {
   RunLoop::SetUp();
@@ -28,5 +27,4 @@ Environment::~Environment() {
   RunLoop::TearDown();
 }
 
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/environment.h

@@ -8,7 +8,6 @@
 #include "mojo/public/system/macros.h"
 
 namespace mojo {
-namespace utility {
 
 namespace internal {
 class BindingsSupportImpl;
@@ -28,7 +27,6 @@ class Environment {
   MOJO_DISALLOW_COPY_AND_ASSIGN(Environment);
 };
 
-}  // namespace utility
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_UTILITY_ENVIRONMENT_H_

mojo/public/utility/run_loop.cc

@@ -13,7 +13,6 @@
 #include "mojo/public/utility/thread_local.h"
 
 namespace mojo {
-namespace utility {
 namespace {
 
 ThreadLocalPointer<RunLoop>* tls_run_loop = NULL;
@@ -207,5 +206,4 @@ RunLoop::WaitState RunLoop::GetWaitState() const {
   return wait_state;
 }
 
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/run_loop.h

@@ -10,7 +10,6 @@
 #include "mojo/public/system/core_cpp.h"
 
 namespace mojo {
-namespace utility {
 
 class RunLoopHandler;
 
@@ -95,7 +94,6 @@ class RunLoop {
   MOJO_DISALLOW_COPY_AND_ASSIGN(RunLoop);
 };
 
-}  // namespace utility
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_UTILITY_RUN_LOOP_H_

mojo/public/utility/run_loop_handler.h

@@ -8,7 +8,6 @@
 #include "mojo/public/system/core_cpp.h"
 
 namespace mojo {
-namespace utility {
 
 // Used by RunLoop to notify when a handle is either ready or has become
 // invalid.
@@ -21,7 +20,6 @@ class RunLoopHandler {
   virtual ~RunLoopHandler() {}
 };
 
-}  // namespace utility
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_UTILITY_RUN_LOOP_HANDLER_H_

mojo/public/utility/run_loop_unittest.cc

@@ -12,7 +12,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace utility {
 namespace {
 
 class TestRunLoopHandler : public RunLoopHandler {
@@ -190,5 +189,4 @@ TEST_F(RunLoopTest, Current) {
 }
 
 }  // namespace
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/thread_local.h

@@ -57,7 +57,6 @@
 #include "mojo/public/system/macros.h"
 
 namespace mojo {
-namespace utility {
 namespace internal {
 
 // Helper functions that abstract the cross-platform APIs.  Do not use directly.
@@ -124,7 +123,6 @@ class ThreadLocalBoolean {
   MOJO_DISALLOW_COPY_AND_ASSIGN(ThreadLocalBoolean);
 };
 
-}  // namespace utility
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_UTILITY_THREAD_LOCAL_H_

mojo/public/utility/thread_local_posix.cc

@@ -8,7 +8,6 @@
 #include <pthread.h>
 
 namespace mojo {
-namespace utility {
 namespace internal {
 
 // static
@@ -38,5 +37,4 @@ void ThreadLocalPlatform::SetValueInSlot(SlotType slot, void* value) {
 }
 
 }  // namespace internal
-}  // namespace utility
 }  // namespace mojo

mojo/public/utility/thread_local_win.cc

@@ -8,7 +8,6 @@
 #include <windows.h>
 
 namespace mojo {
-namespace utility {
 namespace internal {
 
 // static
@@ -37,5 +36,4 @@ void ThreadLocalPlatform::SetValueInSlot(SlotType slot, void* value) {
 }
 
 }  // namespace internal
-}  // namespace utility
 }  // namespace mojo