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_

[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"
 #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_