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

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

Issue 22403003: Update chrome://newtab checks in browser tests to use chrome::IsNTPURL(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/sys_info.h" 13 #include "base/sys_info.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/chrome_content_browser_client.h" 15 #include "chrome/browser/chrome_content_browser_client.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/command_updater.h" 17 #include "chrome/browser/command_updater.h"
18 #include "chrome/browser/content_settings/host_content_settings_map.h" 18 #include "chrome/browser/content_settings/host_content_settings_map.h"
19 #include "chrome/browser/defaults.h" 19 #include "chrome/browser/defaults.h"
20 #include "chrome/browser/extensions/extension_browsertest.h" 20 #include "chrome/browser/extensions/extension_browsertest.h"
21 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/extensions/extension_system.h" 22 #include "chrome/browser/extensions/extension_system.h"
23 #include "chrome/browser/extensions/tab_helper.h" 23 #include "chrome/browser/extensions/tab_helper.h"
24 #include "chrome/browser/first_run/first_run.h" 24 #include "chrome/browser/first_run/first_run.h"
25 #include "chrome/browser/lifetime/application_lifetime.h" 25 #include "chrome/browser/lifetime/application_lifetime.h"
26 #include "chrome/browser/prefs/incognito_mode_prefs.h" 26 #include "chrome/browser/prefs/incognito_mode_prefs.h"
27 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/profiles/profile_manager.h" 28 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/search/search.h"
29 #include "chrome/browser/sessions/session_backend.h" 30 #include "chrome/browser/sessions/session_backend.h"
30 #include "chrome/browser/sessions/session_service_factory.h" 31 #include "chrome/browser/sessions/session_service_factory.h"
31 #include "chrome/browser/translate/translate_tab_helper.h" 32 #include "chrome/browser/translate/translate_tab_helper.h"
32 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" 33 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
33 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" 34 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
34 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" 35 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
35 #include "chrome/browser/ui/browser.h" 36 #include "chrome/browser/ui/browser.h"
36 #include "chrome/browser/ui/browser_command_controller.h" 37 #include "chrome/browser/ui/browser_command_controller.h"
37 #include "chrome/browser/ui/browser_commands.h" 38 #include "chrome/browser/ui/browser_commands.h"
38 #include "chrome/browser/ui/browser_finder.h" 39 #include "chrome/browser/ui/browser_finder.h"
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 // Make sure the state matches. 1203 // Make sure the state matches.
1203 TabStripModel* new_model = new_browser->tab_strip_model(); 1204 TabStripModel* new_model = new_browser->tab_strip_model();
1204 EXPECT_TRUE(new_model->IsAppTab(0)); 1205 EXPECT_TRUE(new_model->IsAppTab(0));
1205 EXPECT_FALSE(new_model->IsAppTab(1)); 1206 EXPECT_FALSE(new_model->IsAppTab(1));
1206 EXPECT_FALSE(new_model->IsAppTab(2)); 1207 EXPECT_FALSE(new_model->IsAppTab(2));
1207 1208
1208 EXPECT_TRUE(new_model->IsTabPinned(0)); 1209 EXPECT_TRUE(new_model->IsTabPinned(0));
1209 EXPECT_TRUE(new_model->IsTabPinned(1)); 1210 EXPECT_TRUE(new_model->IsTabPinned(1));
1210 EXPECT_FALSE(new_model->IsTabPinned(2)); 1211 EXPECT_FALSE(new_model->IsTabPinned(2));
1211 1212
1212 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), 1213 EXPECT_TRUE(chrome::IsNTPURL(new_model->GetWebContentsAt(2)->GetURL(),
1213 new_model->GetWebContentsAt(2)->GetURL()); 1214 browser()->profile()));
1214 1215
1215 EXPECT_TRUE( 1216 EXPECT_TRUE(
1216 extensions::TabHelper::FromWebContents( 1217 extensions::TabHelper::FromWebContents(
1217 new_model->GetWebContentsAt(0))->extension_app() == extension_app); 1218 new_model->GetWebContentsAt(0))->extension_app() == extension_app);
1218 } 1219 }
1219 #endif // !defined(OS_CHROMEOS) 1220 #endif // !defined(OS_CHROMEOS)
1220 1221
1221 // This test verifies we don't crash when closing the last window and the app 1222 // This test verifies we don't crash when closing the last window and the app
1222 // menu is showing. 1223 // menu is showing.
1223 // TODO(linux_aura) http://crbug.com/163931 1224 // TODO(linux_aura) http://crbug.com/163931
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2237 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2237 } 2238 }
2238 2239
2239 // Shift-middle-clicks open in a foreground tab. 2240 // Shift-middle-clicks open in a foreground tab.
2240 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { 2241 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
2241 int modifiers = WebKit::WebInputEvent::ShiftKey; 2242 int modifiers = WebKit::WebInputEvent::ShiftKey;
2242 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; 2243 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
2243 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; 2244 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
2244 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2245 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2245 } 2246 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698