Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/test/base/test_html_dialog_observer.cc

 // 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.
 
 #include "chrome/test/base/test_html_dialog_observer.h"
 
 #include "chrome/common/chrome_notification_types.h"
 #include "content/test/js_injection_ready_observer.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/webui/web_ui.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
 TestHtmlDialogObserver::TestHtmlDialogObserver(
     JsInjectionReadyObserver* js_injection_ready_observer)
     : js_injection_ready_observer_(js_injection_ready_observer),
       web_ui_(NULL), done_(false), running_(false) {
   registrar_.Add(this, chrome::NOTIFICATION_HTML_DIALOG_SHOWN,
@@ skipping 45 matching lines @@
 }
 
 WebUI* TestHtmlDialogObserver::GetWebUI() {
   if (!done_) {
     EXPECT_FALSE(running_);
     running_ = true;
     ui_test_utils::RunMessageLoop();
   }
   return web_ui_;
 }