Move JavascriptTestObserver from chrome to content.

chrome/test/nacl/nacl_browsertest_util.h

 // 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.
 
 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 
 #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;
 
   // This method provides a higher-level interface for handling JSON messages
   // from the DOM automation controler.  Instead of handling a string
   // containing a JSON-encoded object, this specialization of TestMessageHandler
   // decodes the string into a dictionary. This makes it easier to send and
   // receive structured messages.  It is assumed the dictionary will always have
   // a "type" field that indicates the nature of message.
   virtual MessageResponse HandleStructuredMessage(
@@ skipping 52 matching lines @@
 
   virtual bool IsPnaclDisabled();
 
   // Map a file relative to the variant directory to a URL served by the test
   // web server.
   GURL TestURL(const base::FilePath::StringType& url_fragment);
 
   // 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.
   void RunLoadTest(const base::FilePath::StringType& test_file);
 
   // Run a test that was originally written to use NaCl's integration testing
   // jig. These tests were originally driven by NaCl's SCons build in the
   // nacl_integration test stage on the Chrome waterfall. Changes in the
   // boundaries between the Chrome and NaCl repos have resulted in many of
   // these tests having a stronger affinity with the Chrome repo. This method
@@ skipping 90 matching lines @@
 
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_