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

Unified Diff: chrome/test/nacl/nacl_browsertest_util.cc

Issue 286243003: Move JavascriptTestObserver from chrome to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary content prefixes Created 6 years, 7 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/test/nacl/nacl_browsertest_util.h ('k') | chrome/test/nacl/pnacl_header_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_browsertest_util.cc
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc
index 8843aa984344197f1f0362ebd7689697139441a8..19758e1c696aa6306cba950aa57358c49f3f2d1f 100644
--- a/chrome/test/nacl/nacl_browsertest_util.cc
+++ b/chrome/test/nacl/nacl_browsertest_util.cc
@@ -20,7 +20,7 @@
#include "content/public/common/webplugininfo.h"
#include "net/base/net_util.h"
-typedef TestMessageHandler::MessageResponse MessageResponse;
+typedef content::TestMessageHandler::MessageResponse MessageResponse;
MessageResponse StructuredMessageHandler::HandleMessage(
const std::string& json) {
@@ -234,9 +234,10 @@ GURL NaClBrowserTestBase::TestURL(
return test_server_->GetURL(expanded_url.MaybeAsASCII());
}
-bool NaClBrowserTestBase::RunJavascriptTest(const GURL& url,
- TestMessageHandler* handler) {
- JavascriptTestObserver observer(
+bool NaClBrowserTestBase::RunJavascriptTest(
+ const GURL& url,
+ content::TestMessageHandler* handler) {
+ content::JavascriptTestObserver observer(
browser()->tab_strip_model()->GetActiveWebContents(),
handler);
ui_test_utils::NavigateToURL(browser(), url);
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.h ('k') | chrome/test/nacl/pnacl_header_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698