Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows…

chrome/browser/ui/panels/old_panel_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/download_manager.h"
 #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"
 #include "ui/gfx/screen.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
@@ skipping 1324 matching lines @@
                            SHOW_AS_ACTIVE);
   params.url = ui_test_utils::GetTestUrl(
       FilePath(kTestDir),
       FilePath(FILE_PATH_LITERAL("onbeforeunload.html")));
   Panel* panel = CreatePanelWithParams(params);
   EXPECT_EQ(1, panel_manager->num_panels());
   WebContents* web_contents = panel->GetWebContents();
 
   // 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();
   EXPECT_EQ(title_first_close, title_watcher->WaitAndGetTitle());
   EXPECT_EQ(1, panel_manager->num_panels());
 
   // 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();
   EXPECT_EQ(title_second_close, title_watcher->WaitAndGetTitle());
   EXPECT_EQ(1, panel_manager->num_panels());
 
   // Close panel and respond to the onbeforeunload dialog with accept. This is
   // equivalent to clicking "Leave this page".
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CLOSED,
@@ skipping 120 matching lines @@
   EXPECT_GE(smaller_work_area_size.width(), panel->max_size().width());
   EXPECT_EQ(smaller_work_area_size.height(), panel->max_size().height());
   EXPECT_GT(old_full_size.width(), panel->full_size().width());
   EXPECT_GT(old_full_size.height(), panel->full_size().height());
   EXPECT_GE(panel->max_size().width(), panel->full_size().width());
   EXPECT_GE(panel->max_size().height(), panel->full_size().height());
   EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height());
 
   panel->Close();
 }