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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host_browsertest.cc

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_util.h" 5 #include "base/string_util.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/test/base/in_process_browser_test.h" 8 #include "chrome/test/base/in_process_browser_test.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 #include "content/browser/tab_contents/tab_contents.h" 10 #include "content/browser/tab_contents/tab_contents.h"
11 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
12 #include "content/public/browser/notification_types.h" 12 #include "content/public/browser/notification_types.h"
13 #include "net/test/test_server.h" 13 #include "net/test/test_server.h"
14 14
15 class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest { 15 class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest {
16 public: 16 public:
17 ResourceDispatcherHostBrowserTest() { 17 ResourceDispatcherHostBrowserTest() {
18 EnableDOMAutomation(); 18 EnableDOMAutomation();
19 } 19 }
20 20
21 protected: 21 protected:
22 RenderViewHost* render_view_host() { 22 RenderViewHost* render_view_host() {
23 return browser()->GetSelectedTabContents()->GetRenderViewHost(); 23 return browser()->GetSelectedWebContents()->GetRenderViewHost();
24 } 24 }
25 25
26 bool GetPopupTitle(const GURL& url, string16* title); 26 bool GetPopupTitle(const GURL& url, string16* title);
27 }; 27 };
28 28
29 bool ResourceDispatcherHostBrowserTest::GetPopupTitle(const GURL& url, 29 bool ResourceDispatcherHostBrowserTest::GetPopupTitle(const GURL& url,
30 string16* title) { 30 string16* title) {
31 ui_test_utils::NavigateToURL(browser(), url); 31 ui_test_utils::NavigateToURL(browser(), url);
32 32
33 ui_test_utils::WindowedNotificationObserver observer( 33 ui_test_utils::WindowedNotificationObserver observer(
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // See http://crbug.com/5988 67 // See http://crbug.com/5988
68 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle2) { 68 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle2) {
69 ASSERT_TRUE(test_server()->Start()); 69 ASSERT_TRUE(test_server()->Start());
70 70
71 GURL url(test_server()->GetURL("files/dynamic2.html")); 71 GURL url(test_server()->GetURL("files/dynamic2.html"));
72 string16 title; 72 string16 title;
73 ASSERT_TRUE(GetPopupTitle(url, &title)); 73 ASSERT_TRUE(GetPopupTitle(url, &title));
74 EXPECT_TRUE(StartsWith(title, ASCIIToUTF16("My Dynamic Title"), true)) 74 EXPECT_TRUE(StartsWith(title, ASCIIToUTF16("My Dynamic Title"), true))
75 << "Actual title: " << title; 75 << "Actual title: " << title;
76 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698