Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4349)

Unified Diff: chrome/browser/ui/panels/old_panel_browsertest.cc

Issue 10815025: Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/login/login_prompt_browsertest.cc ('k') | chrome/browser/unload_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/old_panel_browsertest.cc
===================================================================
--- chrome/browser/ui/panels/old_panel_browsertest.cc (revision 147602)
+++ chrome/browser/ui/panels/old_panel_browsertest.cc (working copy)
@@ -36,6 +36,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
#include "content/test/net/url_request_mock_http_job.h"
#include "net/base/net_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -1380,8 +1381,8 @@
// Close panel and respond to the onbeforeunload dialog with cancel. This is
// equivalent to clicking "Stay on this page"
- scoped_ptr<ui_test_utils::TitleWatcher> title_watcher(
- new ui_test_utils::TitleWatcher(web_contents, title_first_close));
+ scoped_ptr<content::TitleWatcher> title_watcher(
+ new content::TitleWatcher(web_contents, title_first_close));
panel->Close();
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
alert->native_dialog()->CancelAppModalDialog();
@@ -1391,7 +1392,7 @@
// Close panel and respond to the onbeforeunload dialog with close. This is
// equivalent to clicking the OS close button on the dialog.
title_watcher.reset(
- new ui_test_utils::TitleWatcher(web_contents, title_second_close));
+ new content::TitleWatcher(web_contents, title_second_close));
panel->Close();
alert = ui_test_utils::WaitForAppModalDialog();
alert->native_dialog()->CloseAppModalDialog();
« no previous file with comments | « chrome/browser/ui/login/login_prompt_browsertest.cc ('k') | chrome/browser/unload_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698