Move //mojo/shell to //shell

shell/dynamic_service_runner.cc

Index: shell/dynamic_service_runner.cc
diff --git a/mojo/shell/dynamic_service_runner.cc b/shell/dynamic_service_runner.cc
similarity index 82%
rename from mojo/shell/dynamic_service_runner.cc
rename to shell/dynamic_service_runner.cc
index 7f44305f6db8f8b7998edee68a21951c25cba917..fc0a0abc72bc9c3e1e2721a1db7d682ac5ae2b55 100644
--- a/mojo/shell/dynamic_service_runner.cc
+++ b/shell/dynamic_service_runner.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/shell/dynamic_service_runner.h"
+#include "shell/dynamic_service_runner.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ -22,9 +22,8 @@ bool SetThunks(Thunks (*make_thunks)(),
                const char* function_name,
                base::NativeLibrary library) {
   typedef size_t (*SetThunksFn)(const Thunks* thunks);
-  SetThunksFn set_thunks =
-      reinterpret_cast<SetThunksFn>(base::GetFunctionPointerFromNativeLibrary(
-          library, function_name));
+  SetThunksFn set_thunks = reinterpret_cast<SetThunksFn>(
+      base::GetFunctionPointerFromNativeLibrary(library, function_name));
   if (!set_thunks)
     return false;
   Thunks thunks = make_thunks();
@@ -56,8 +55,8 @@ base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
     // start running any go code. This is a temporary patch.
     typedef void (*InitGoRuntimeFn)();
     InitGoRuntimeFn init_go_runtime = reinterpret_cast<InitGoRuntimeFn>(
-        base::GetFunctionPointerFromNativeLibrary(
-            app_library, "InitGoRuntime"));
+        base::GetFunctionPointerFromNativeLibrary(app_library,
+                                                  "InitGoRuntime"));
     if (init_go_runtime) {
       DVLOG(2) << "InitGoRuntime: Initializing Go Runtime found in app";
       init_go_runtime();
@@ -68,13 +67,11 @@ base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
       break;
     }
 
-    if (SetThunks(&MojoMakeGLES2ControlThunks,
-                  "MojoSetGLES2ControlThunks",
+    if (SetThunks(&MojoMakeGLES2ControlThunks, "MojoSetGLES2ControlThunks",
                   app_library)) {
       // If we have the control thunks, we should also have the GLES2
       // implementation thunks.
-      if (!SetThunks(&MojoMakeGLES2ImplThunks,
-                     "MojoSetGLES2ImplThunks",
+      if (!SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
                      app_library)) {
         LOG(ERROR) << app_path.value()
                    << " has MojoSetGLES2ControlThunks, "
@@ -86,11 +83,9 @@ base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
       // thunks. Applications may use or not use any of these, so don't warn if
       // they are missing.
       SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
-                "MojoSetGLES2ImplChromiumTextureMailboxThunks",
-                app_library);
+                "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library);
       SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
-                "MojoSetGLES2ImplChromiumSyncPointThunks",
-                app_library);
+                "MojoSetGLES2ImplChromiumSyncPointThunks", app_library);
     }
     // Unlike system thunks, we don't warn on a lack of GLES2 thunks because
     // not everything is a visual app.
@@ -105,8 +100,8 @@ base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
     // |MojoMain()| takes ownership of the service handle.
     MojoResult result = main_function(service_handle.release().value());
     if (result < MOJO_RESULT_OK) {
-      LOG(ERROR) << app_path.value()
-                 << " MojoMain returned error(" << result << ")";
+      LOG(ERROR) << app_path.value() << " MojoMain returned error(" << result
+                 << ")";
     }
   } while (false);