Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/base/test_navigation_observer.h

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_

[Paweł Hajdan Jr., 2011/11/17 09:47:10]

If you're moving this, could you rather move it to content/test, and move any
possible chrome dependencies along (there shouldn't be too many) ?

[Sheridan Rawlins, 2011/11/17 16:46:25]

I don't feel comfortable adding that to this scope & here's why: The major
chrome dependency is on ui_test_utils::RunMessageLoop().  While this _can_ be
moved over, it will affect many files and should be a CL of its own.  If you
feel strongly about moving more test framework to content, please file a bug.

On 2011/11/17 09:47:10, Paweł Hajdan Jr. wrote:

[Paweł Hajdan Jr., 2011/11/17 17:11:42]

You're moving this anyway, so it really makes sense to move it to the right
place.

You could solve the "too amny places depend on RunMessageLoop" by making the
chrome RunMessageLoop call the content RunMessageLoop until all call places are
transitioned.

[Sheridan Rawlins, 2011/11/17 23:20:35]

Thanks for the suggestion.  Filed http://crbug.com/104677 for the migration

Done.

[Sheridan Rawlins, 2011/11/18 05:17:34]

Argh...  Now I'm hitting check_deps because of the dependency on views...

I really don't think this is worth the trouble for this bug.  I will roll back
this move.

On 2011/11/17 23:20:35, Sheridan Rawlins wrote:

[Paweł Hajdan Jr., 2011/11/21 08:57:25]

Okay, feel free to commit without this move (LGTM). However, I'm really
surprised by this. Can't content use views? Maybe it'd be OK to add that
dependency.

[Sheridan Rawlins, 2011/11/23 20:10:07]

FYI, filed http://crbug.com/105213 for followup.  content can NOT use views, but
we may have a pattern to allow the ui_test_utils::RunMessageLoop to remain in
chrome/test but integrate with the content/test observation utilities, which
I'll investigate (not in the scope of this CL).

On 2011/11/21 08:57:25, Paweł Hajdan Jr. wrote:

+#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_