Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/base/test_navigation_observer.h

 // Copyright (c) 2011 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_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"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
+class JsInjectionReadyObserver;
 class NavigationController;
 class RenderViewHost;
 
 // For browser_tests, which run on the UI thread, run a second
 // MessageLoop and quit when the navigation completes loading. For
 // WebUI tests that need to inject javascript, construct with a
 // JsInjectionReadyObserver and this class will call its
 // OnJsInjectionReady() at the appropriate time.
 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.
   // Note: |js_injection_ready_observer| is owned by the caller and should be
   // valid until this class is destroyed.
   TestNavigationObserver(const content::NotificationSource& source,
                          JsInjectionReadyObserver* js_injection_ready_observer,
                          int number_of_navigations);
 
   virtual ~TestNavigationObserver();
@@ skipping 38 matching lines @@
   // |running_| will be true during WaitForObservation until |done_| is true.
   bool running_;
 
   // |rvho_send_js_| will hold a RenderViewHostObserver subclass to allow
   // JavaScript injection at the appropriate time.
   scoped_ptr<RVHOSendJS> rvho_send_js_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNavigationObserver);
 };
 
-#endif  // CHROME_TEST_TEST_NAVIGATION_OBSERVER_H_
+#endif  // CHROME_TEST_BASE_TEST_NAVIGATION_OBSERVER_H_