Rename BrowserPluginGuestManagerDelegate to BrowserPluginGuestManager

content/browser/browser_plugin/test_guest_manager.h

Index: content/browser/browser_plugin/test_guest_manager.h
diff --git a/content/browser/browser_plugin/test_guest_manager_delegate.h b/content/browser/browser_plugin/test_guest_manager.h
similarity index 71%
rename from content/browser/browser_plugin/test_guest_manager_delegate.h
rename to content/browser/browser_plugin/test_guest_manager.h
index 3adcee1a904b35728b259677ce5a60172f683f4e..415c46520a7059367af9694164f79c0b7b738940 100644
--- a/content/browser/browser_plugin/test_guest_manager_delegate.h
+++ b/content/browser/browser_plugin/test_guest_manager.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_DELEGATE_H_
-#define CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_DELEGATE_H_
+#ifndef CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_H_
+#define CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_H_
 
 #include <map>
 
 #include "base/memory/singleton.h"
-#include "content/public/browser/browser_plugin_guest_manager_delegate.h"
+#include "content/public/browser/browser_plugin_guest_manager.h"
 
 namespace content {
 
@@ -17,11 +17,11 @@ class WebContentsImpl;
 
 // This class is temporary until BrowserPluginHostTest.* tests are entirely
 // moved out of content.
-class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate {
+class TestGuestManager : public BrowserPluginGuestManager {
  public:
-  virtual ~TestGuestManagerDelegate();
+  virtual ~TestGuestManager();
 
-  static TestGuestManagerDelegate* GetInstance();
+  static TestGuestManager* GetInstance();
 
   void AddGuest(int guest_instance_id, WebContents* guest_web_contents);
   void RemoveGuest(int guest_instance_id);
@@ -30,7 +30,7 @@ class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate {
   // Waits until at least one guest is added to this guest manager.
   WebContentsImpl* WaitForGuestAdded();
 
-  // BrowserPluginGuestManagerDelegate implementation.
+  // BrowserPluginGuestManager implementation.
   virtual content::WebContents* CreateGuest(

[jam, 2014/05/07 19:38:10]

here adn below, remove "content::"

[Fady Samuel, 2014/05/11 02:40:26]

Done.

       content::SiteInstance* embedder_site_instance,
       int instance_id,
@@ -46,8 +46,8 @@ class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate {
                             const GuestCallback& callback) OVERRIDE;
 
  private:
-  friend struct DefaultSingletonTraits<TestGuestManagerDelegate>;
-  TestGuestManagerDelegate();
+  friend struct DefaultSingletonTraits<TestGuestManager>;
+  TestGuestManager();
 
   // Contains guests' WebContents, mapping from their instance ids.
   typedef std::map<int, WebContents*> GuestInstanceMap;
@@ -56,9 +56,9 @@ class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate {
   int next_instance_id_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestGuestManagerDelegate);
+  DISALLOW_COPY_AND_ASSIGN(TestGuestManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_DELEGATE_H_
+#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_TEST_GUEST_MANAGER_H_