| Index: chrome/browser/apps/web_view_browsertest.cc
|
| diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
|
| index f1a23afdd950fb8397cac511feed108698dc8282..8e71fd905cb6694a7ce41d6d5b8696f299865292 100644
|
| --- a/chrome/browser/apps/web_view_browsertest.cc
|
| +++ b/chrome/browser/apps/web_view_browsertest.cc
|
| @@ -9,8 +9,6 @@
|
| #include "chrome/browser/apps/app_browsertest_util.h"
|
| #include "chrome/browser/chrome_content_browser_client.h"
|
| #include "chrome/browser/extensions/extension_test_message_listener.h"
|
| -#include "chrome/browser/guest_view/guest_view_manager.h"
|
| -#include "chrome/browser/guest_view/guest_view_manager_factory.h"
|
| #include "chrome/browser/prerender/prerender_link_manager.h"
|
| #include "chrome/browser/prerender/prerender_link_manager_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -31,6 +29,8 @@
|
| #include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/fake_speech_recognition_manager.h"
|
| #include "content/public/test/test_renderer_host.h"
|
| +#include "extensions/browser/guest_view/guest_view_manager.h"
|
| +#include "extensions/browser/guest_view/guest_view_manager_factory.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extensions_client.h"
|
| #include "media/base/media_switches.h"
|
| @@ -94,7 +94,7 @@ class TestInterstitialPageDelegate : public content::InterstitialPageDelegate {
|
| virtual std::string GetHTMLContents() OVERRIDE { return std::string(); }
|
| };
|
|
|
| -class TestGuestViewManager : public GuestViewManager {
|
| +class TestGuestViewManager : public extensions::GuestViewManager {
|
| public:
|
| explicit TestGuestViewManager(content::BrowserContext* context) :
|
| GuestViewManager(context),
|
| @@ -113,7 +113,8 @@ class TestGuestViewManager : public GuestViewManager {
|
| // GuestViewManager override:
|
| virtual void AddGuest(int guest_instance_id,
|
| content::WebContents* guest_web_contents) OVERRIDE{
|
| - GuestViewManager::AddGuest(guest_instance_id, guest_web_contents);
|
| + extensions::GuestViewManager::AddGuest(
|
| + guest_instance_id, guest_web_contents);
|
| web_contents_ = guest_web_contents;
|
|
|
| if (message_loop_runner_)
|
| @@ -125,14 +126,15 @@ class TestGuestViewManager : public GuestViewManager {
|
| };
|
|
|
| // Test factory for creating test instances of GuestViewManager.
|
| -class TestGuestViewManagerFactory : public GuestViewManagerFactory {
|
| +class TestGuestViewManagerFactory :
|
| + public extensions::GuestViewManagerFactory {
|
| public:
|
| TestGuestViewManagerFactory() :
|
| test_guest_view_manager_(NULL) {}
|
|
|
| virtual ~TestGuestViewManagerFactory() {}
|
|
|
| - virtual GuestViewManager* CreateGuestViewManager(
|
| + virtual extensions::GuestViewManager* CreateGuestViewManager(
|
| content::BrowserContext* context) OVERRIDE {
|
| return GetManager(context);
|
| }
|
| @@ -727,7 +729,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
|
|
|
| WebViewTest() : guest_web_contents_(NULL),
|
| embedder_web_contents_(NULL) {
|
| - GuestViewManager::set_factory_for_testing(&factory_);
|
| + extensions::GuestViewManager::set_factory_for_testing(&factory_);
|
| }
|
|
|
| private:
|
|
|