Rename BrowserPluginGuestManagerDelegate to BrowserPluginGuestManager

content/browser/browser_plugin/browser_plugin_host_browsertest.cc

 // Copyright 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.
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest_delegate.h"
-#include "content/browser/browser_plugin/test_guest_manager_delegate.h"
+#include "content/browser/browser_plugin/test_guest_manager.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 231 matching lines @@
                               bool is_guest_data_url,
                               const std::string& embedder_code) {
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     GURL test_url(embedded_test_server()->GetURL(embedder_url));
     NavigateToURL(shell(), test_url);
 
     WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
         shell()->web_contents());
     static_cast<ShellBrowserContext*>(
         embedder_web_contents->GetBrowserContext())->
-            set_guest_manager_delegate_for_testing(
-                TestGuestManagerDelegate::GetInstance());
+            set_guest_manager_for_testing(
+                TestGuestManager::GetInstance());
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         embedder_web_contents->GetRenderViewHost());
     RenderFrameHost* rfh = embedder_web_contents->GetMainFrame();
     // Focus the embedder.
     rvh->Focus();
     // Activative IME.
     rvh->SetInputMethodActive(true);
 
     // Allow the test to do some operations on the embedder before we perform
     // the first navigation of the guest.
     if (!embedder_code.empty())
       ExecuteSyncJSFunction(rfh, embedder_code);
 
     if (!is_guest_data_url) {
       test_url = embedded_test_server()->GetURL(guest_url);
       ExecuteSyncJSFunction(
           rfh, base::StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     } else {
       ExecuteSyncJSFunction(
           rfh, base::StringPrintf("SetSrc('%s');", guest_url.c_str()));
     }
 
     test_embedder_ = static_cast<TestBrowserPluginEmbedder*>(
         embedder_web_contents->GetBrowserPluginEmbedder());
     ASSERT_TRUE(test_embedder_);
 
     test_guest_manager_ =
-        static_cast<TestGuestManagerDelegate*>(
+        static_cast<TestGuestManager*>(
             embedder_web_contents->GetBrowserContext()->
-                GetGuestManagerDelegate());
+                GetGuestManager());

[lazyboy, 2014/05/05 21:47:46]

Should fit in previous line.

[Fady Samuel, 2014/05/07 19:01:51]

Done.

 
     WebContentsImpl* test_guest_web_contents =
         test_guest_manager_->WaitForGuestAdded();
 
     test_guest_ = static_cast<TestBrowserPluginGuest*>(
         test_guest_web_contents->GetBrowserPluginGuest());
     test_guest_->WaitForLoadStop();
   }
 
   TestBrowserPluginEmbedder* test_embedder() const { return test_embedder_; }
   TestBrowserPluginGuest* test_guest() const { return test_guest_; }
-  TestGuestManagerDelegate* test_guest_manager() const {
+  TestGuestManager* test_guest_manager() const {
     return test_guest_manager_;
   }
 
  private:
   TestBrowserPluginEmbedder* test_embedder_;
   TestBrowserPluginGuest* test_guest_;
-  TestGuestManagerDelegate* test_guest_manager_;
+  TestGuestManager* test_guest_manager_;
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginHostTest);
 };
 
 // This test ensures that if guest isn't there and we resize the guest (from
 // js), it remembers the size correctly.
 //
 // Initially we load an embedder with a guest without a src attribute (which has
 // dimension 640x480), resize it to 100x200, and then we set the source to a
 // sample guest. In the end we verify that the correct size has been set.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, NavigateAfterResize) {
@@ skipping 693 matching lines @@
     scoped_ptr<base::Value> value =
         content::ExecuteScriptAndGetValue(
             guest_rfh, "document.getElementById('input1').value");
     std::string actual_value;
     ASSERT_TRUE(value->GetAsString(&actual_value));
     EXPECT_EQ(base::UTF16ToUTF8(expected_value), actual_value);
   }
 }
 
 }  // namespace content