| Index: chrome/browser/apps/guest_view/app_view_browsertest.cc
|
| diff --git a/chrome/browser/apps/guest_view/app_view_browsertest.cc b/chrome/browser/apps/guest_view/app_view_browsertest.cc
|
| index 8ddc15d7d40942de10f6b32c8146a387422f5cc2..0e105c79ff92cea6f1d103f3236fdd92af692d4e 100644
|
| --- a/chrome/browser/apps/guest_view/app_view_browsertest.cc
|
| +++ b/chrome/browser/apps/guest_view/app_view_browsertest.cc
|
| @@ -8,6 +8,7 @@
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/test_utils.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_factory.h"
|
| #include "extensions/common/switches.h"
|
| @@ -20,8 +21,10 @@ namespace {
|
|
|
| class TestGuestViewManager : public extensions::GuestViewManager {
|
| public:
|
| - explicit TestGuestViewManager(content::BrowserContext* context) :
|
| - extensions::GuestViewManager(context),
|
| + TestGuestViewManager(
|
| + content::BrowserContext* context,
|
| + scoped_ptr<guestview::GuestViewManagerDelegate> delegate) :
|
| + extensions::GuestViewManager(context, delegate.Pass()),
|
| web_contents_(NULL) {}
|
|
|
| content::WebContents* WaitForGuestCreated() {
|
| @@ -64,7 +67,10 @@ class TestGuestViewManagerFactory : public extensions::GuestViewManagerFactory {
|
|
|
| TestGuestViewManager* GetManager(content::BrowserContext* context) {
|
| if (!test_guest_view_manager_) {
|
| - test_guest_view_manager_ = new TestGuestViewManager(context);
|
| + test_guest_view_manager_ = new TestGuestViewManager(
|
| + context,
|
| + scoped_ptr<guestview::GuestViewManagerDelegate>(
|
| + new extensions::ExtensionsGuestViewManagerDelegate(context)));
|
| }
|
| return test_guest_view_manager_;
|
| }
|
|
|