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

Side by Side Diff: chrome/browser/sessions/session_restore_browsertest.cc

Issue 2441513003: Actually disable tests on Mac (previous commit didn't update test names). (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « chrome/browser/sessions/better_session_restore_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 1252
1253 // Regression test for crbug.com/240156. When restoring tabs with a navigation, 1253 // Regression test for crbug.com/240156. When restoring tabs with a navigation,
1254 // the navigation should take active tab focus. 1254 // the navigation should take active tab focus.
1255 // Flaky on Mac. http://crbug.com/656211. 1255 // Flaky on Mac. http://crbug.com/656211.
1256 #if defined(OS_MACOSX) 1256 #if defined(OS_MACOSX)
1257 #define MAYBE_RestoreWithNavigateSelectedTab \ 1257 #define MAYBE_RestoreWithNavigateSelectedTab \
1258 DISABLED_RestoreWithNavigateSelectedTab 1258 DISABLED_RestoreWithNavigateSelectedTab
1259 #else 1259 #else
1260 #define MAYBE_RestoreWithNavigateSelectedTab RestoreWithNavigateSelectedTab 1260 #define MAYBE_RestoreWithNavigateSelectedTab RestoreWithNavigateSelectedTab
1261 #endif 1261 #endif
1262 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWithNavigateSelectedTab) { 1262 IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
1263 MAYBE_RestoreWithNavigateSelectedTab) {
1263 // Create 2 tabs. 1264 // Create 2 tabs.
1264 ui_test_utils::NavigateToURL(browser(), url1_); 1265 ui_test_utils::NavigateToURL(browser(), url1_);
1265 ui_test_utils::NavigateToURLWithDisposition( 1266 ui_test_utils::NavigateToURLWithDisposition(
1266 browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB, 1267 browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
1267 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 1268 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
1268 1269
1269 // Restore the session by calling chrome::Navigate(). 1270 // Restore the session by calling chrome::Navigate().
1270 Browser* new_browser = 1271 Browser* new_browser =
1271 QuitBrowserAndRestoreWithURL(browser(), 3, url3_, true); 1272 QuitBrowserAndRestoreWithURL(browser(), 3, url3_, true);
1272 ASSERT_EQ(1u, active_browser_list_->size()); 1273 ASSERT_EQ(1u, active_browser_list_->size());
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 // automatically at the start of the test. 1502 // automatically at the start of the test.
1502 for (size_t i = 1; i < web_contents().size(); i++) { 1503 for (size_t i = 1; i < web_contents().size(); i++) {
1503 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); 1504 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
1504 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); 1505 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
1505 if (i > 0) { 1506 if (i > 0) {
1506 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), 1507 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
1507 web_contents()[i]->GetLastActiveTime()); 1508 web_contents()[i]->GetLastActiveTime());
1508 } 1509 }
1509 } 1510 }
1510 } 1511 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/better_session_restore_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698