chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc - Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.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

« no previous file with comments | « chrome/browser/apps/guest_view/app_view_browsertest.cc ('k') | chrome/browser/chromeos/login/helper.cc » ('j') | extensions/browser/guest_view/extensions_guest_view_manager_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc

diff --git a/chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc b/chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc

index f5392208b29dc1df0de21aa1a5181e6d07f22bac..d81eb20020a7713b534ba7632f48e718c51ee14d 100644

--- a/chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc

+++ b/chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc

@@ -6,6 +6,7 @@

#include "chrome/browser/apps/app_browsertest_util.h"

#include "chrome/test/base/ui_test_utils.h"

#include "content/public/test/browser_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/test/extension_test_message_listener.h"

@@ -14,8 +15,10 @@ namespace {

class TestGuestViewManager : public extensions::GuestViewManager {

public:

- explicit TestGuestViewManager(content::BrowserContext* context)

- : extensions::GuestViewManager(context), web_contents_(NULL) {}

+ TestGuestViewManager(content::BrowserContext* context,

+ scoped_ptr<guestview::GuestViewManagerDelegate> delegate)

+ : extensions::GuestViewManager(context, delegate.Pass()),

+ web_contents_(NULL) {}

content::WebContents* WaitForGuestCreated() {

if (web_contents_)

@@ -56,7 +59,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_;

}