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

Side by Side Diff: chrome/browser/prerender/prefetch_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/public/test/browser_test_utils.h"
12 13
13 namespace { 14 namespace {
14 15
15 const char kPrefetchPage[] = "files/prerender/simple_prefetch.html"; 16 const char kPrefetchPage[] = "files/prerender/simple_prefetch.html";
16 17
17 class PrefetchBrowserTestBase : public InProcessBrowserTest { 18 class PrefetchBrowserTestBase : public InProcessBrowserTest {
18 public: 19 public:
19 explicit PrefetchBrowserTestBase(bool do_prefetching) 20 explicit PrefetchBrowserTestBase(bool do_prefetching)
20 : do_prefetching_(do_prefetching) {} 21 : do_prefetching_(do_prefetching) {}
21 22
(...skipping 23 matching lines...) Expand all
45 public: 46 public:
46 PrefetchBrowserTestNoPrefetching() 47 PrefetchBrowserTestNoPrefetching()
47 : PrefetchBrowserTestBase(false) {} 48 : PrefetchBrowserTestBase(false) {}
48 }; 49 };
49 50
50 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTest, PrefetchOn) { 51 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTest, PrefetchOn) {
51 ASSERT_TRUE(test_server()->Start()); 52 ASSERT_TRUE(test_server()->Start());
52 GURL url = test_server()->GetURL(kPrefetchPage); 53 GURL url = test_server()->GetURL(kPrefetchPage);
53 54
54 const string16 expected_title = ASCIIToUTF16("link onload"); 55 const string16 expected_title = ASCIIToUTF16("link onload");
55 ui_test_utils::TitleWatcher title_watcher( 56 content::TitleWatcher title_watcher(
56 chrome::GetActiveWebContents(browser()), 57 chrome::GetActiveWebContents(browser()),
57 expected_title); 58 expected_title);
58 ui_test_utils::NavigateToURL(browser(), url); 59 ui_test_utils::NavigateToURL(browser(), url);
59 60
60 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 61 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
61 } 62 }
62 63
63 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestNoPrefetching, PrefetchOff) { 64 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestNoPrefetching, PrefetchOff) {
64 ASSERT_TRUE(test_server()->Start()); 65 ASSERT_TRUE(test_server()->Start());
65 GURL url = test_server()->GetURL(kPrefetchPage); 66 GURL url = test_server()->GetURL(kPrefetchPage);
66 67
67 const string16 expected_title = ASCIIToUTF16("link onerror"); 68 const string16 expected_title = ASCIIToUTF16("link onerror");
68 ui_test_utils::TitleWatcher title_watcher( 69 content::TitleWatcher title_watcher(
69 chrome::GetActiveWebContents(browser()), 70 chrome::GetActiveWebContents(browser()),
70 expected_title); 71 expected_title);
71 ui_test_utils::NavigateToURL(browser(), url); 72 ui_test_utils::NavigateToURL(browser(), url);
72 73
73 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 74 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
74 } 75 }
75 76
76 } // namespace 77 } // namespace
77 78
OLDNEW
« no previous file with comments | « chrome/browser/history/history_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698