Rename a bunch of Mojo Application stuff to reference Services.

content/child/child_thread_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 84 matching lines @@
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
 
   // ChildThread implementation:
 #if defined(OS_WIN)
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
   void RecordAction(const base::UserMetricsAction& action) override;
   void RecordComputedAction(const std::string& action) override;
-  MojoShellConnection* GetMojoShellConnection() override;
+  ServiceManagerConnection* GetServiceManagerConnection() override;
   shell::InterfaceRegistry* GetInterfaceRegistry() override;
   shell::InterfaceProvider* GetRemoteInterfaces() override;
 
   IPC::SyncChannel* channel() { return channel_.get(); }
 
   IPC::MessageRouter* GetRouter();
 
   mojom::RouteProvider* GetRemoteRouteProvider();
 
   // Allocates a block of shared memory of the given size. Returns NULL on
@@ skipping 82 matching lines @@
   // process.
   static void ShutdownThread();
 #endif
 
  protected:
   friend class ChildProcess;
 
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
-  // Called by subclasses to manually start the MojoShellConnection. Must only
-  // be called if ChildThreadImpl::Options::auto_start_mojo_shell_connection
-  // was set to |false| on ChildThreadImpl construction.
-  void StartMojoShellConnection();
+  // Called by subclasses to manually start the ServiceManagerConnection. Must
+  // only be called if
+  // ChildThreadImpl::Options::auto_start_service_manager_connection was set to
+  // |false| on ChildThreadImpl construction.
+  void StartServiceManagerConnection();
 
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
   virtual void OnProcessBackgrounded(bool backgrounded);
   virtual void OnProcessPurgeAndSuspend();
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& msg) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
@@ skipping 39 matching lines @@
       mojom::AssociatedInterfaceProviderAssociatedRequest request) override;
 
   // mojom::AssociatedInterfaceProvider:
   void GetAssociatedInterface(
       const std::string& name,
       mojom::AssociatedInterfaceAssociatedRequest request) override;
 
   std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
   std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
   std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
-  std::unique_ptr<MojoShellConnection> mojo_shell_connection_;
+  std::unique_ptr<ServiceManagerConnection> service_manager_connection_;
   std::unique_ptr<shell::Connection> browser_connection_;
 
   mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_;
   mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider>
       associated_interface_provider_bindings_;
   mojom::RouteProviderAssociatedPtr remote_route_provider_;
 
   std::unique_ptr<IPC::SyncChannel> channel_;
 
   // Allows threads other than the main thread to send sync messages.
@@ skipping 46 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl);
 };
 
 struct ChildThreadImpl::Options {
   Options(const Options& other);
   ~Options();
 
   class Builder;
 
-  bool auto_start_mojo_shell_connection;
+  bool auto_start_service_manager_connection;
   bool connect_to_browser;
   scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner;
   std::vector<IPC::MessageFilter*> startup_filters;
-  std::string in_process_application_token;
+  std::string in_process_service_request_token;
 
  private:
   Options();
 };
 
 class ChildThreadImpl::Options::Builder {
  public:
   Builder();
 
   Builder& InBrowserProcess(const InProcessChildThreadParams& params);
-  Builder& AutoStartMojoShellConnection(bool auto_start);
+  Builder& AutoStartServiceManagerConnection(bool auto_start);
   Builder& ConnectToBrowser(bool connect_to_browser);
   Builder& AddStartupFilter(IPC::MessageFilter* filter);
 
   Options Build();
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_