Move JavascriptTestObserver from chrome to content.

content/public/test/javascript_test_observer.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_BASE_JAVASCRIPT_TEST_OBSERVER_H_
-#define CHROME_TEST_BASE_JAVASCRIPT_TEST_OBSERVER_H_
+#ifndef CONTENT_PUBLIC_TEST_JAVASCRIPT_TEST_OBSERVER_H_
+#define CONTENT_PUBLIC_TEST_JAVASCRIPT_TEST_OBSERVER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 class WebContents;
-}
 
 // Base class for handling a stream of automation messages produced by a
 // JavascriptTestObserver.
 class TestMessageHandler {
  public:
   enum MessageResponse {
     // Reset the timeout and keep running.
     CONTINUE,
     // Stop runnning.
     DONE
@@ skipping 18 matching lines @@
   // Prepare the handler to be used or reused.
   virtual void Reset();
 
  private:
   bool ok_;
   std::string error_message_;
 };
 
 // This class captures a stream of automation messages coming from a Javascript
 // test and dispatches them to a message handler.
 class JavascriptTestObserver : public content::NotificationObserver {

[jam, 2014/05/16 17:56:36]

nit: here and below, and in the cc file, remove "content::"

  public:
   // The observer does not own any arguments passed to it.  It is assumed that
   // the arguments will outlive all uses of the observer.
-  JavascriptTestObserver(
-      content::WebContents* web_contents,
-      TestMessageHandler* handler);
+  JavascriptTestObserver(WebContents* web_contents,
+                         TestMessageHandler* handler);
 
   virtual ~JavascriptTestObserver();
 
   // Pump the message loop until the message handler indicates the Javascript
   // test is done running.  Return true if the test jig functioned correctly and
   // nothing timed out.
   bool Run();
 
   // Prepare the observer to be used again.  This method should NOT be called
   // while Run() is pumping the message loop.
@@ skipping 12 matching lines @@
   void EndTest();
 
   TestMessageHandler* handler_;
   bool running_;
   bool finished_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(JavascriptTestObserver);
 };
 
-#endif  // CHROME_TEST_BASE_JAVASCRIPT_TEST_OBSERVER_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_TEST_JAVASCRIPT_TEST_OBSERVER_H_