Rename a bunch of Mojo Application stuff to reference Services.

content/public/browser/browser_context.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_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 #define CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 36 matching lines @@
 }
 
 namespace content {
 
 class BackgroundSyncController;
 class BlobHandle;
 class BrowserPluginGuestManager;
 class DownloadManager;
 class DownloadManagerDelegate;
 class IndexedDBContext;
-class MojoShellConnection;
 class PermissionManager;
 class PushMessagingService;
 class ResourceContext;
+class ServiceManagerConnection;
 class SiteInstance;
 class StoragePartition;
 class SSLHostStateDelegate;
 
 // A mapping from the scheme name to the protocol handler that services its
 // content.
 typedef std::map<
   std::string, linked_ptr<net::URLRequestJobFactory::ProtocolHandler> >
     ProtocolHandlerMap;
 
@@ skipping 69 matching lines @@
   // that the ResourceContext is ready.
   static void EnsureResourceContextInitialized(BrowserContext* browser_context);
 
   // Tells the HTML5 objects on this context to persist their session state
   // across the next restart.
   static void SaveSessionState(BrowserContext* browser_context);
 
   static void SetDownloadManagerForTesting(BrowserContext* browser_context,
                                            DownloadManager* download_manager);
 
-  // Makes mojo aware of this BrowserContext, and assigns a user ID number to
-  // it. Should be called for each BrowserContext created.
+  // Makes the Service Manager aware of this BrowserContext, and assigns a user
+  // ID number to it. Should be called for each BrowserContext created.
   static void Initialize(BrowserContext* browser_context,
                          const base::FilePath& path);
 
-  // Returns a Shell User ID associated with this BrowserContext. This ID is not
-  // persistent across runs. See
+  // Returns a Service User ID associated with this BrowserContext. This ID is
+  // not persistent across runs. See
   // services/shell/public/interfaces/connector.mojom. By default, this user id
   // is randomly generated when Initialize() is called.
-  static const std::string& GetShellUserIdFor(BrowserContext* browser_context);
+  static const std::string& GetServiceUserIdFor(
+      BrowserContext* browser_context);
 
   // Returns the BrowserContext associated with |user_id|, or nullptr if no
   // BrowserContext exists for that |user_id|.
-  static BrowserContext* GetBrowserContextForShellUserId(
+  static BrowserContext* GetBrowserContextForServiceUserId(
       const std::string& user_id);
 
   // Returns a Connector associated with this BrowserContext, which can be used
   // to connect to service instances bound as this user.
-  static shell::Connector* GetShellConnectorFor(
-      BrowserContext* browser_context);
-  static MojoShellConnection* GetMojoShellConnectionFor(
+  static shell::Connector* GetConnectorFor(BrowserContext* browser_context);
+  static ServiceManagerConnection* GetServiceManagerConnectionFor(
       BrowserContext* browser_context);
 
   ~BrowserContext() override;
 
   // Shuts down the storage partitions associated to this browser context.
   // This must be called before the browser context is actually destroyed
   // and before a clean-up task for its corresponding IO thread residents (e.g.
   // ResourceContext) is posted, so that the classes that hung on
   // StoragePartition can have time to do necessary cleanups on IO thread.
   void ShutdownStoragePartitions();
@@ skipping 61 matching lines @@
   // called only once per partition_path.
   virtual net::URLRequestContextGetter*
       CreateMediaRequestContextForStoragePartition(
           const base::FilePath& partition_path,
           bool in_memory) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_