| Index: chrome/test/base/test_navigation_observer.h
|
| diff --git a/chrome/test/test_navigation_observer.h b/chrome/test/base/test_navigation_observer.h
|
| similarity index 85%
|
| rename from chrome/test/test_navigation_observer.h
|
| rename to chrome/test/base/test_navigation_observer.h
|
| index 401b4c0bc34619f9e085fdfec84347ada4e0844f..510e56fd0a640ba5a6e509f2dc9ef6d03a65cec9 100644
|
| --- a/chrome/test/test_navigation_observer.h
|
| +++ b/chrome/test/base/test_navigation_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_TEST_NAVIGATION_OBSERVER_H_
|
| -#define CHROME_TEST_TEST_NAVIGATION_OBSERVER_H_
|
| +#ifndef CHROME_TEST_BASE_TEST_NAVIGATION_OBSERVER_H_
|
| +#define CHROME_TEST_BASE_TEST_NAVIGATION_OBSERVER_H_
|
| #pragma once
|
|
|
| #include "base/compiler_specific.h"
|
| @@ -11,6 +11,7 @@
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
|
|
| +class JsInjectionReadyObserver;
|
| class NavigationController;
|
| class RenderViewHost;
|
|
|
| @@ -23,17 +24,6 @@ class TestNavigationObserver : public content::NotificationObserver {
|
| public:
|
| class RVHOSendJS;
|
|
|
| - // Interface to notify when JavaScript injection is possible.
|
| - class JsInjectionReadyObserver {
|
| - public:
|
| - JsInjectionReadyObserver();
|
| - virtual ~JsInjectionReadyObserver();
|
| -
|
| - // Called to indicate page entry committed and ready for JavaScript
|
| - // injection.
|
| - virtual void OnJsInjectionReady(RenderViewHost* render_view_host) = 0;
|
| - };
|
| -
|
| // Create and register a new TestNavigationObserver against the
|
| // |controller|. When |js_injection_ready_observer| is non-null, notify with
|
| // OnEntryCommitted() after |number_of_navigations| navigations.
|
| @@ -92,4 +82,4 @@ class TestNavigationObserver : public content::NotificationObserver {
|
| DISALLOW_COPY_AND_ASSIGN(TestNavigationObserver);
|
| };
|
|
|
| -#endif // CHROME_TEST_TEST_NAVIGATION_OBSERVER_H_
|
| +#endif // CHROME_TEST_BASE_TEST_NAVIGATION_OBSERVER_H_
|
|
|