Adds more webview tests to app_shell_browsertests.

chrome/browser/apps/web_view_browsertest.cc

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 6799fccf00254e1affd178ebd40438156c56859a..fed212dcf4e7ce7eb410c87f7d9c37466e9fe46c 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -30,6 +30,7 @@
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
+#include "extensions/browser/guest_view/web_view/test_guest_view_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/test/extension_test_message_listener.h"
@@ -95,85 +96,6 @@ class TestInterstitialPageDelegate : public content::InterstitialPageDelegate {
   virtual std::string GetHTMLContents() OVERRIDE { return std::string(); }
 };
 
-class TestGuestViewManager : public extensions::GuestViewManager {
- public:
-  explicit TestGuestViewManager(content::BrowserContext* context) :
-      GuestViewManager(context),
-      seen_guest_removed_(false),
-      web_contents_(NULL) {}
-
-  content::WebContents* WaitForGuestCreated() {
-    if (web_contents_)
-      return web_contents_;
-
-    created_message_loop_runner_ = new content::MessageLoopRunner;
-    created_message_loop_runner_->Run();
-    return web_contents_;
-  }
-
-  void WaitForGuestDeleted() {
-    if (seen_guest_removed_)
-      return;
-
-    deleted_message_loop_runner_ = new content::MessageLoopRunner;
-    deleted_message_loop_runner_->Run();
-  }
-
- private:
-  // GuestViewManager override:
-  virtual void AddGuest(int guest_instance_id,
-                        content::WebContents* guest_web_contents) OVERRIDE{
-    extensions::GuestViewManager::AddGuest(
-        guest_instance_id, guest_web_contents);
-    web_contents_ = guest_web_contents;
-    seen_guest_removed_ = false;
-
-    if (created_message_loop_runner_.get())
-      created_message_loop_runner_->Quit();
-  }
-
-  virtual void RemoveGuest(int guest_instance_id) OVERRIDE {
-    extensions::GuestViewManager::RemoveGuest(guest_instance_id);
-    web_contents_ = NULL;
-    seen_guest_removed_ = true;
-
-    if (deleted_message_loop_runner_.get())
-      deleted_message_loop_runner_->Quit();
-  }
-
-  bool seen_guest_removed_;
-  content::WebContents* web_contents_;
-  scoped_refptr<content::MessageLoopRunner> created_message_loop_runner_;
-  scoped_refptr<content::MessageLoopRunner> deleted_message_loop_runner_;
-};
-
-// Test factory for creating test instances of GuestViewManager.
-class TestGuestViewManagerFactory :
-  public extensions::GuestViewManagerFactory {
- public:
-  TestGuestViewManagerFactory() :
-      test_guest_view_manager_(NULL) {}
-
-  virtual ~TestGuestViewManagerFactory() {}
-
-  virtual extensions::GuestViewManager* CreateGuestViewManager(
-      content::BrowserContext* context) OVERRIDE {
-    return GetManager(context);
-  }
-
-  TestGuestViewManager* GetManager(content::BrowserContext* context) {
-    if (!test_guest_view_manager_) {
-      test_guest_view_manager_ = new TestGuestViewManager(context);
-    }
-    return test_guest_view_manager_;
-  }
-
- private:
-  TestGuestViewManager* test_guest_view_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory);
-};
-
 class WebContentsHiddenObserver : public content::WebContentsObserver {
  public:
   WebContentsHiddenObserver(content::WebContents* web_contents,
@@ -744,8 +666,10 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
     return embedder_web_contents_;
   }
 
-  TestGuestViewManager* GetGuestViewManager() {
-    return factory_.GetManager(browser()->profile());
+  extensions::TestGuestViewManager* GetGuestViewManager() {
+    return static_cast<extensions::TestGuestViewManager*>(
+        extensions::TestGuestViewManager::FromBrowserContext(
+            browser()->profile()));
   }
 
   WebViewTest() : guest_web_contents_(NULL),
@@ -766,7 +690,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
   scoped_ptr<content::FakeSpeechRecognitionManager>
       fake_speech_recognition_manager_;
 
-  TestGuestViewManagerFactory factory_;
+  extensions::TestGuestViewManagerFactory factory_;
   // Note that these are only set if you launch app using LoadAppWithGuest().
   content::WebContents* guest_web_contents_;
   content::WebContents* embedder_web_contents_;