| 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 88%
|
| rename from chrome/test/base/javascript_test_observer.h
|
| rename to content/public/test/javascript_test_observer.h
|
| index a35ea92e4f9e083b86e8fb8ddda4ddb019158f2f..19eb399a7c4d50d5c8438bb5b10ecf06a4a1d5ed 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.
|
| @@ -60,9 +59,8 @@ class JavascriptTestObserver : public content::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();
|
|
|
| @@ -95,4 +93,6 @@ class JavascriptTestObserver : public content::NotificationObserver {
|
| DISALLOW_COPY_AND_ASSIGN(JavascriptTestObserver);
|
| };
|
|
|
| -#endif // CHROME_TEST_BASE_JAVASCRIPT_TEST_OBSERVER_H_
|
| +} // namespace content
|
| +
|
| +#endif // CONTENT_PUBLIC_TEST_JAVASCRIPT_TEST_OBSERVER_H_
|
|
|