Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/base/test_navigation_observer.cc

Index: chrome/test/base/test_navigation_observer.cc
diff --git a/chrome/test/test_navigation_observer.cc b/chrome/test/base/test_navigation_observer.cc
similarity index 91%
rename from chrome/test/test_navigation_observer.cc
rename to chrome/test/base/test_navigation_observer.cc
index 0e9f6bb632a575ab60b49817fa3ae873b887d415..2a57df78d929a11369c98c1895e4512826faca68 100644
--- a/chrome/test/test_navigation_observer.cc
+++ b/chrome/test/base/test_navigation_observer.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_navigation_observer.h"
+#include "chrome/test/base/test_navigation_observer.h"
 
+#include "chrome/test/base/js_injection_ready_observer.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ -34,16 +35,9 @@ class TestNavigationObserver::RVHOSendJS
   DISALLOW_COPY_AND_ASSIGN(RVHOSendJS);
 };
 
-TestNavigationObserver::JsInjectionReadyObserver::JsInjectionReadyObserver() {
-}
-
-TestNavigationObserver::JsInjectionReadyObserver::~JsInjectionReadyObserver() {
-}
-
 TestNavigationObserver::TestNavigationObserver(
     const content::NotificationSource& source,
-    TestNavigationObserver::JsInjectionReadyObserver*
-        js_injection_ready_observer,
+    JsInjectionReadyObserver* js_injection_ready_observer,
     int number_of_navigations)
     : navigation_started_(false),
       navigations_completed_(0),
@@ -71,7 +65,7 @@ void TestNavigationObserver::WaitForObservation() {
 }
 
 TestNavigationObserver::TestNavigationObserver(
-    TestNavigationObserver::JsInjectionReadyObserver*
+    JsInjectionReadyObserver*
         js_injection_ready_observer,
     int number_of_navigations)
     : navigation_started_(false),