Rename BrowserPluginGuestManagerDelegate to BrowserPluginGuestManager

content/shell/browser/shell_browser_context.h

Index: content/shell/browser/shell_browser_context.h
diff --git a/content/shell/browser/shell_browser_context.h b/content/shell/browser/shell_browser_context.h
index 63bbf34905dbee27485b52b3d05fc3e682d82a6f..afd34a23c2e1cfd08967a03112e7b8515c999bc5 100644
--- a/content/shell/browser/shell_browser_context.h
+++ b/content/shell/browser/shell_browser_context.h
@@ -29,9 +29,9 @@ class ShellBrowserContext : public BrowserContext {
   ShellBrowserContext(bool off_the_record, net::NetLog* net_log);
   virtual ~ShellBrowserContext();
 
-  void set_guest_manager_delegate_for_testing(
-      BrowserPluginGuestManagerDelegate* guest_manager_delegate) {
-    guest_manager_delegate_ = guest_manager_delegate;
+  void set_guest_manager_for_testing(
+      BrowserPluginGuestManager* guest_manager) {
+    guest_manager_ = guest_manager;
   }
 
   // BrowserContext implementation.
@@ -72,8 +72,8 @@ class ShellBrowserContext : public BrowserContext {
   virtual ResourceContext* GetResourceContext() OVERRIDE;
   virtual GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;
-  virtual content::BrowserPluginGuestManagerDelegate*
-      GetGuestManagerDelegate() OVERRIDE;
+  virtual content::BrowserPluginGuestManager*
+      GetGuestManager() OVERRIDE;
   virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
   net::URLRequestContextGetter* CreateRequestContext(
@@ -96,7 +96,7 @@ class ShellBrowserContext : public BrowserContext {
   net::NetLog* net_log_;
   bool ignore_certificate_errors_;
   base::FilePath path_;
-  BrowserPluginGuestManagerDelegate* guest_manager_delegate_;
+  BrowserPluginGuestManager* guest_manager_;
   scoped_ptr<ShellResourceContext> resource_context_;
   scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
   scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;