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

Side by Side Diff: chrome/browser/ui/browser_navigator_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused. Created 7 years, 1 month 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 "chrome/browser/ui/browser_navigator_browsertest.h" 5 #include "chrome/browser/ui/browser_navigator_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 ShortenUberURL(browser()->tab_strip_model()-> 1086 ShortenUberURL(browser()->tab_strip_model()->
1087 GetActiveWebContents()->GetURL())); 1087 GetActiveWebContents()->GetURL()));
1088 } 1088 }
1089 1089
1090 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, 1090 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
1091 NavigateFromNTPToOptionsInSameTab) { 1091 NavigateFromNTPToOptionsInSameTab) {
1092 chrome::NavigateParams p(MakeNavigateParams()); 1092 chrome::NavigateParams p(MakeNavigateParams());
1093 p.url = GURL(chrome::kChromeUINewTabURL); 1093 p.url = GURL(chrome::kChromeUINewTabURL);
1094 ui_test_utils::NavigateToURL(&p); 1094 ui_test_utils::NavigateToURL(&p);
1095 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 1095 EXPECT_EQ(1, browser()->tab_strip_model()->count());
1096 EXPECT_TRUE(chrome::IsNTPURL( 1096 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
1097 browser()->tab_strip_model()->GetActiveWebContents()->GetURL(), 1097 browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
1098 browser()->profile()));
1099 1098
1100 { 1099 {
1101 content::WindowedNotificationObserver observer( 1100 content::WindowedNotificationObserver observer(
1102 content::NOTIFICATION_LOAD_STOP, 1101 content::NOTIFICATION_LOAD_STOP,
1103 content::NotificationService::AllSources()); 1102 content::NotificationService::AllSources());
1104 chrome::ShowSettings(browser()); 1103 chrome::ShowSettings(browser());
1105 observer.Wait(); 1104 observer.Wait();
1106 } 1105 }
1107 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 1106 EXPECT_EQ(1, browser()->tab_strip_model()->count());
1108 EXPECT_EQ(GetSettingsURL(), 1107 EXPECT_EQ(GetSettingsURL(),
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 // Open a renderer initiated POST request in new foreground tab. 1350 // Open a renderer initiated POST request in new foreground tab.
1352 string16 expected_title(base::ASCIIToUTF16(kExpectedTitle)); 1351 string16 expected_title(base::ASCIIToUTF16(kExpectedTitle));
1353 std::string post_data = kExpectedTitle; 1352 std::string post_data = kExpectedTitle;
1354 string16 title; 1353 string16 title;
1355 ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle( 1354 ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle(
1356 test_server()->GetURL(kEchoTitleCommand), post_data, false, &title)); 1355 test_server()->GetURL(kEchoTitleCommand), post_data, false, &title));
1357 EXPECT_NE(expected_title, title); 1356 EXPECT_NE(expected_title, title);
1358 } 1357 }
1359 1358
1360 } // namespace 1359 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_focus_uitest.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698