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

Side by Side Diff: chrome/browser/iframe_browsertest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 13
14 class IFrameTest : public InProcessBrowserTest { 14 class IFrameTest : public InProcessBrowserTest {
15 protected: 15 protected:
16 void NavigateAndVerifyTitle(const char* file, const char* page_title) { 16 void NavigateAndVerifyTitle(const char* file, const char* page_title) {
17 GURL url = ui_test_utils::GetTestUrl( 17 GURL url = ui_test_utils::GetTestUrl(
18 base::FilePath(), base::FilePath().AppendASCII(file)); 18 base::FilePath(), base::FilePath().AppendASCII(file));
19 19
20 ui_test_utils::NavigateToURL(browser(), url); 20 ui_test_utils::NavigateToURL(browser(), url);
21 EXPECT_EQ(ASCIIToUTF16(page_title), 21 EXPECT_EQ(ASCIIToUTF16(page_title),
22 browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); 22 browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
23 } 23 }
24 }; 24 };
25 25
26 IN_PROC_BROWSER_TEST_F(IFrameTest, Crash) { 26 IN_PROC_BROWSER_TEST_F(IFrameTest, Crash) {
27 NavigateAndVerifyTitle("iframe.html", "iframe test"); 27 NavigateAndVerifyTitle("iframe.html", "iframe test");
28 } 28 }
29 29
30 IN_PROC_BROWSER_TEST_F(IFrameTest, InEmptyFrame) { 30 IN_PROC_BROWSER_TEST_F(IFrameTest, InEmptyFrame) {
31 NavigateAndVerifyTitle("iframe_in_empty_frame.html", "iframe test"); 31 NavigateAndVerifyTitle("iframe_in_empty_frame.html", "iframe test");
32 } 32 }
OLDNEW
« no previous file with comments | « chrome/browser/history/web_history_service.cc ('k') | chrome/browser/importer/external_process_importer_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698