GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/guest_view_manager_unittest.cc

Index: extensions/browser/guest_view/guest_view_manager_unittest.cc
diff --git a/extensions/browser/guest_view/guest_view_manager_unittest.cc b/extensions/browser/guest_view/guest_view_manager_unittest.cc
index 1646e49e357e9dee506adc5ebf98ec75f000cdf3..64ac7906a5ddb80c539b31d996bf746977428bd3 100644
--- a/extensions/browser/guest_view/guest_view_manager_unittest.cc
+++ b/extensions/browser/guest_view/guest_view_manager_unittest.cc
@@ -9,9 +9,13 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extensions_test.h"
+#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
+#include "extensions/browser/guest_view/guest_view_manager.h"
+#include "extensions/browser/guest_view/guest_view_manager_delegate.h"
 
 using content::WebContents;
 using content::WebContentsTester;
+using guestview::GuestViewManagerDelegate;
 
 namespace extensions {
 
@@ -21,8 +25,9 @@ namespace guestview {
 // GuestViewManager.
 class TestGuestViewManager : public GuestViewManager {

[Fady Samuel, 2015/04/24 01:31:24]

Get rid of TestGuestViewManager here.

[Fady Samuel, 2015/04/24 04:37:48]

Done.

  public:
-  explicit TestGuestViewManager(content::BrowserContext* context)
-      : GuestViewManager(context) {}
+  TestGuestViewManager(content::BrowserContext* context,
+                       scoped_ptr<GuestViewManagerDelegate> delegate)
+      : GuestViewManager(context, delegate.Pass()) {}
 
   int last_instance_id_removed_for_testing() {
     return last_instance_id_removed_;
@@ -64,8 +69,10 @@ class GuestViewManagerTest : public extensions::ExtensionsTest {
 
 TEST_F(GuestViewManagerTest, AddRemove) {
   content::TestBrowserContext browser_context;
+  scoped_ptr<GuestViewManagerDelegate> delegate(
+      new ExtensionsGuestViewManagerDelegate(&browser_context));
   scoped_ptr<guestview::TestGuestViewManager> manager(
-      new guestview::TestGuestViewManager(&browser_context));
+      new guestview::TestGuestViewManager(&browser_context, delegate.Pass()));
 
   scoped_ptr<WebContents> web_contents1(CreateWebContents());
   scoped_ptr<WebContents> web_contents2(CreateWebContents());