chrome/test/base/testing_profile.cc - Issue 464533002: Move guest_view to extensions.

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/test/base/testing_profile.cc

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Spacing are fixed. Created 6 years, 4 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:

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index 72f1e80b7b13ed31f89f5080308e4d0a89ac0caf..7aede511fc9e3fff3b7c812e33c4eab4f72feda3 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

@@ -84,8 +84,8 @@

#include "chrome/browser/extensions/extension_special_storage_policy.h"

#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/test_extension_system.h"

-#include "chrome/browser/guest_view/guest_view_manager.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/browser/guest_view/guest_view_manager.h"

#endif

#if defined(OS_ANDROID)

@@ -820,7 +820,7 @@ HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {

content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {

#if defined(ENABLE_EXTENSIONS)

- return GuestViewManager::FromBrowserContext(this);

+ return extensions::GuestViewManager::FromBrowserContext(this);

#else

return NULL;

#endif