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

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

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/base/javascript_test_observer.cc ('k') | chrome/test/nacl/nacl_browsertest_util.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.h
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index bfe8709c9bb0bc4faa7662f766c0bd13d7af6177..d72a6d71865ab178882b3c67c9199c2ca9633efc 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -8,11 +8,11 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/javascript_test_observer.h"
+#include "content/public/test/javascript_test_observer.h"
// A helper base class that decodes structured automation messages of the form:
// {"type": type_name, ...}
-class StructuredMessageHandler : public TestMessageHandler {
+class StructuredMessageHandler : public content::TestMessageHandler {
public:
virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
@@ -85,7 +85,7 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
// Load a URL and listen to automation events with a given handler.
// Returns true if the test glue function correctly. (The handler should
// seperately indicate if the test failed.)
- bool RunJavascriptTest(const GURL& url, TestMessageHandler* handler);
+ bool RunJavascriptTest(const GURL& url, content::TestMessageHandler* handler);
// Run a simple test that checks that a nexe loads correctly. Useful for
// setting up other tests, such as checking that UMA data was logged.
« no previous file with comments | « chrome/test/base/javascript_test_observer.cc ('k') | chrome/test/nacl/nacl_browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698