Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: extensions/browser/guest_view/test_guest_view_manager.cc

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed tests Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/guest_view/test_guest_view_manager.cc
diff --git a/extensions/browser/guest_view/test_guest_view_manager.cc b/extensions/browser/guest_view/test_guest_view_manager.cc
index ce7b12525bae6dff2f2fa04c46d2f98f35e359c4..9716ce98abe2d690815153f01baaa39a3a54ac3a 100644
--- a/extensions/browser/guest_view/test_guest_view_manager.cc
+++ b/extensions/browser/guest_view/test_guest_view_manager.cc
@@ -10,6 +10,7 @@
#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/extension_host.h"
+#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
#include "extensions/browser/process_manager.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_paths.h"
@@ -17,10 +18,14 @@
#include "extensions/shell/test/shell_test.h"
#include "extensions/test/extension_test_message_listener.h"
+using guestview::GuestViewManagerDelegate;
+
namespace extensions {
-TestGuestViewManager::TestGuestViewManager(content::BrowserContext* context)
- : GuestViewManager(context) {
+TestGuestViewManager::TestGuestViewManager(
+ content::BrowserContext* context,
+ scoped_ptr<GuestViewManagerDelegate> delegate)
+ : GuestViewManager(context, delegate.Pass()) {
}
TestGuestViewManager::~TestGuestViewManager() {
@@ -94,7 +99,10 @@ GuestViewManager* TestGuestViewManagerFactory::CreateGuestViewManager(
TestGuestViewManager* TestGuestViewManagerFactory::GetManager(
content::BrowserContext* context) {
DCHECK(!test_guest_view_manager_);
- test_guest_view_manager_ = new TestGuestViewManager(context);
+ test_guest_view_manager_ = new TestGuestViewManager(
+ context,
+ scoped_ptr<guestview::GuestViewManagerDelegate>(
+ new ExtensionsGuestViewManagerDelegate(context)));
return test_guest_view_manager_;
}

Powered by Google App Engine
This is Rietveld 408576698