Move JavascriptTestObserver from chrome to content.

chrome/test/nacl/nacl_browsertest_util.cc

 // Copyright (c) 2012 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 "chrome/test/nacl/nacl_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #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) {
   scoped_ptr<base::Value> value;
   base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS);
   // Automation messages are stringified before they are sent because the
   // automation channel cannot handle arbitrary objects.  This means we
   // need to decode the json twice to get the original message.
   value.reset(reader.ReadToValue(json));
   if (!value.get())
@@ skipping 193 matching lines @@
   return false;
 }
 
 GURL NaClBrowserTestBase::TestURL(
     const base::FilePath::StringType& url_fragment) {
   base::FilePath expanded_url = base::FilePath(FILE_PATH_LITERAL("files"));
   expanded_url = expanded_url.Append(url_fragment);
   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);
   return observer.Run();
 }
 
 void NaClBrowserTestBase::RunLoadTest(
     const base::FilePath::StringType& test_file) {
   LoadTestMessageHandler handler;
   base::FilePath::StringType test_file_with_pnacl = test_file;
@@ skipping 91 matching lines @@
 
 base::FilePath::StringType NaClBrowserTestPnaclNonSfi::Variant() {
   return FILE_PATH_LITERAL("nonsfi");
 }
 
 void NaClBrowserTestPnaclNonSfi::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }