Move JavascriptTestObserver from chrome to content.

content/public/test/javascript_test_observer.h

Index: content/public/test/javascript_test_observer.h
diff --git a/chrome/test/base/javascript_test_observer.h b/content/public/test/javascript_test_observer.h
similarity index 81%
rename from chrome/test/base/javascript_test_observer.h
rename to content/public/test/javascript_test_observer.h
index a35ea92e4f9e083b86e8fb8ddda4ddb019158f2f..f4d945ff57aa6013f0e5716a4119af2def29418b 100644
--- a/chrome/test/base/javascript_test_observer.h
+++ b/content/public/test/javascript_test_observer.h
@@ -2,8 +2,8 @@
 // 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>
 
@@ -17,7 +17,6 @@ class DictionaryValue;
 
 namespace content {
 class WebContents;
-}
 
 // Base class for handling a stream of automation messages produced by a
 // JavascriptTestObserver.
@@ -56,13 +55,12 @@ class TestMessageHandler {
 
 // 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 {
+class JavascriptTestObserver : public NotificationObserver {
  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();
 
@@ -77,8 +75,8 @@ class JavascriptTestObserver : public content::NotificationObserver {
 
   virtual void Observe(
       int type,
-      const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE;
+      const NotificationSource& source,
+      const NotificationDetails& details) OVERRIDE;
 
  private:
   // This message did not signal the end of a test, keep going.
@@ -90,9 +88,11 @@ class JavascriptTestObserver : public content::NotificationObserver {
   TestMessageHandler* handler_;
   bool running_;
   bool finished_;
-  content::NotificationRegistrar registrar_;
+  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_