Rename MojoShellContext -> ServiceManagerContext.

content/shell/renderer/shell_content_renderer_client.cc

Index: content/shell/renderer/shell_content_renderer_client.cc
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 04ae207af01a0f8541368c3d0d54d9444df45f53..e5c8b9f8d96e1cfd44e5cc5d0271a45690909d1a 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
 #include "components/web_cache/renderer/web_cache_impl.h"
-#include "content/public/test/test_mojo_service.mojom.h"
+#include "content/public/test/test_service.mojom.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/shell_render_view_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -35,22 +35,22 @@ namespace content {
 
 namespace {
 
-// A test Mojo service which can be driven by browser tests for various reasons.
-class TestMojoServiceImpl : public mojom::TestMojoService {
+// A test service which can be driven by browser tests for various reasons.
+class TestServiceImpl : public mojom::TestService {
  public:
-  explicit TestMojoServiceImpl(mojom::TestMojoServiceRequest request)
+  explicit TestServiceImpl(mojom::TestServiceRequest request)
       : binding_(this, std::move(request)) {
     binding_.set_connection_error_handler(
-        base::Bind(&TestMojoServiceImpl::OnConnectionError,
+        base::Bind(&TestServiceImpl::OnConnectionError,
                    base::Unretained(this)));
   }
 
-  ~TestMojoServiceImpl() override {}
+  ~TestServiceImpl() override {}
 
  private:
   void OnConnectionError() { delete this; }
 
-  // mojom::TestMojoService:
+  // mojom::TestService:
   void DoSomething(const DoSomethingCallback& callback) override {
     // Instead of responding normally, unbind the pipe, write some garbage,
     // and go away.
@@ -82,14 +82,14 @@ class TestMojoServiceImpl : public mojom::TestMojoService {
     NOTREACHED();
   }
 
-  mojo::Binding<mojom::TestMojoService> binding_;
+  mojo::Binding<mojom::TestService> binding_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestMojoServiceImpl);
+  DISALLOW_COPY_AND_ASSIGN(TestServiceImpl);
 };
 
-void CreateTestMojoService(mojom::TestMojoServiceRequest request) {
+void CreateTestService(mojom::TestServiceRequest request) {
   // Owns itself.
-  new TestMojoServiceImpl(std::move(request));
+  new TestServiceImpl(std::move(request));
 }
 
 }  // namespace
@@ -136,8 +136,8 @@ void ShellContentRendererClient::DidInitializeWorkerContextOnWorkerThread(
 
 void ShellContentRendererClient::ExposeInterfacesToBrowser(
     shell::InterfaceRegistry* interface_registry) {
-  interface_registry->AddInterface<mojom::TestMojoService>(
-      base::Bind(&CreateTestMojoService));
+  interface_registry->AddInterface<mojom::TestService>(
+      base::Bind(&CreateTestService));
 }
 
 #if defined(OS_ANDROID)