Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7042)

Unified Diff: chrome/browser/extensions/extension_view_unittest.cc

Issue 92043: Refactor ExtensionView to support a UI-less extension instance.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_view.cc ('k') | chrome/browser/extensions/extensions_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_view_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_view_unittest.cc (revision 14851)
+++ chrome/browser/extensions/extension_view_unittest.cc (working copy)
@@ -6,7 +6,7 @@
#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"
@@ -28,12 +28,13 @@
// 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();
@@ -58,7 +59,7 @@
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);
}
@@ -100,8 +101,7 @@
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());
}
« no previous file with comments | « chrome/browser/extensions/extension_view.cc ('k') | chrome/browser/extensions/extensions_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698