| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 62cb0bb3bd5a17b2fc9f350a4a3e42a375874f33..f25a16a6fb36534b9fdc83dfb6528382820365df 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -103,8 +103,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 "components/guest_view/browser/guest_view_manager.h"
|
| #include "extensions/browser/extension_system.h"
|
| -#include "extensions/browser/guest_view/guest_view_manager.h"
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -955,7 +955,7 @@ HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
|
|
|
| content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
|
| #if defined(ENABLE_EXTENSIONS)
|
| - return extensions::GuestViewManager::FromBrowserContext(this);
|
| + return guestview::GuestViewManager::FromBrowserContext(this);
|
| #else
|
| return NULL;
|
| #endif
|
|
|