Refactor ExtensionView to support a UI-less extension instance....

chrome/browser/extensions/extension_view_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/ref_counted.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
-#include "chrome/browser/extensions/extension_view.h"
+#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/test_extension_loader.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
 namespace {
 
 // How long to wait for the extension to put up a javascript alert before giving
 // up.
 const int kAlertTimeoutMs = 20000;
 
 // The extension we're using as our test case.
 const char* kExtensionId = "00123456789abcdef0123456789abcdef0123456";
 
 };  // namespace
 
 // This class starts up an extension process and waits until it tries to put
 // up a javascript alert.
-class MockExtensionView : public ExtensionView {
+class MockExtensionHost : public ExtensionHost {
  public:
-  MockExtensionView(Extension* extension, const GURL& url,
-                    SiteInstance* instance, Browser* browser)
-      : ExtensionView(extension, url, instance, browser), got_message_(false) {
-    InitHidden();
+  MockExtensionHost(Extension* extension, const GURL& url,
+                    SiteInstance* instance)
+      : ExtensionHost(extension, instance),
+        got_message_(false) {
+    CreateRenderView(url, NULL);
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         new MessageLoop::QuitTask, kAlertTimeoutMs);
     ui_test_utils::RunMessageLoop();
   }
 
   virtual ExtensionFunctionDispatcher* CreateExtensionFunctionDispatcher(
       RenderViewHost* render_view_host) {
     NOTREACHED();
     return NULL;
   }
 
   bool got_message() { return got_message_; }
  private:
   virtual void RunJavaScriptMessage(
       const std::wstring& message,
       const std::wstring& default_prompt,
       const GURL& frame_url,
       const int flags,
       IPC::Message* reply_msg,
       bool* did_suppress_message) {
     got_message_ = true;
     MessageLoopForUI::current()->Quit();
 
     // Call super, otherwise we'll leak reply_msg.
-    ExtensionView::RunJavaScriptMessage(
+    ExtensionHost::RunJavaScriptMessage(
         message, default_prompt, frame_url, flags,
         reply_msg, did_suppress_message);
   }
 
   bool got_message_;
 };
 
 class ExtensionViewTest : public InProcessBrowserTest {
  public:
   virtual void SetUp() {
@@ skipping 21 matching lines @@
       AppendASCII("good").AppendASCII("extension1").AppendASCII("1");
   ASSERT_TRUE(file_util::DirectoryExists(path));  // sanity check
 
   // Wait for the extension to load and grab a pointer to it.
   TestExtensionLoader loader(browser()->profile());
   Extension* extension = loader.Load(kExtensionId, path);
   ASSERT_TRUE(extension);
   GURL url = Extension::GetResourceURL(extension->url(), "toolstrip1.html");
 
   // Start the extension process and wait for it to show a javascript alert.
-  MockExtensionView view(extension, url,
-      browser()->profile()->GetExtensionsService()->GetSiteInstanceForURL(url),
-      browser());
-  EXPECT_TRUE(view.got_message());
+  MockExtensionHost host(extension, url,
+      browser()->profile()->GetExtensionsService()->GetSiteInstanceForURL(url));
+  EXPECT_TRUE(host.got_message());
 }