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

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

Issue 10407079: Disable NavigatorFrameOtherTabToSingletonOptions on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | 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 (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 "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/autocomplete/autocomplete_edit.h" 9 #include "chrome/browser/autocomplete/autocomplete_edit.h"
10 #include "chrome/browser/prefs/incognito_mode_prefs.h" 10 #include "chrome/browser/prefs/incognito_mode_prefs.h"
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 content::NOTIFICATION_LOAD_STOP, 1149 content::NOTIFICATION_LOAD_STOP,
1150 content::NotificationService::AllSources()); 1150 content::NotificationService::AllSources());
1151 browser()->OpenClearBrowsingDataDialog(); 1151 browser()->OpenClearBrowsingDataDialog();
1152 observer.Wait(); 1152 observer.Wait();
1153 } 1153 }
1154 EXPECT_EQ(2, browser()->tab_count()); 1154 EXPECT_EQ(2, browser()->tab_count());
1155 EXPECT_EQ(GetClearBrowsingDataURL(), 1155 EXPECT_EQ(GetClearBrowsingDataURL(),
1156 browser()->GetSelectedWebContents()->GetURL()); 1156 browser()->GetSelectedWebContents()->GetURL());
1157 } 1157 }
1158 1158
1159 #if defined(OS_MACOSX) 1159 // Times out on mac, fails on linux.
1160 // http://crbug.com/119779
1161 #if defined(OS_MACOSX) || defined(OS_LINUX)
1160 #define MAYBE_NavigateFromOtherTabToSingletonOptions DISABLED_NavigateFromOtherT abToSingletonOptions 1162 #define MAYBE_NavigateFromOtherTabToSingletonOptions DISABLED_NavigateFromOtherT abToSingletonOptions
1161 #else 1163 #else
1162 #define MAYBE_NavigateFromOtherTabToSingletonOptions NavigatorFrameOtherTabToSin gletonOptions 1164 #define MAYBE_NavigateFromOtherTabToSingletonOptions NavigatorFrameOtherTabToSin gletonOptions
1163 #endif 1165 #endif
1164
1165 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, 1166 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
1166 MAYBE_NavigateFromOtherTabToSingletonOptions) { 1167 MAYBE_NavigateFromOtherTabToSingletonOptions) {
1167 { 1168 {
1168 ui_test_utils::WindowedNotificationObserver observer( 1169 ui_test_utils::WindowedNotificationObserver observer(
1169 content::NOTIFICATION_LOAD_STOP, 1170 content::NOTIFICATION_LOAD_STOP,
1170 content::NotificationService::AllSources()); 1171 content::NotificationService::AllSources());
1171 browser()->OpenOptionsDialog(); 1172 browser()->OpenOptionsDialog();
1172 observer.Wait(); 1173 observer.Wait();
1173 } 1174 }
1174 { 1175 {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 EXPECT_EQ(browser(), p2.browser); 1323 EXPECT_EQ(browser(), p2.browser);
1323 1324
1324 // We should now have two windows, the browser() provided by the framework and 1325 // We should now have two windows, the browser() provided by the framework and
1325 // the panel window we opened earlier. The tabbed browser window has 2 tabs. 1326 // the panel window we opened earlier. The tabbed browser window has 2 tabs.
1326 EXPECT_EQ(2u, BrowserList::size()); 1327 EXPECT_EQ(2u, BrowserList::size());
1327 EXPECT_EQ(2, browser()->tab_count()); 1328 EXPECT_EQ(2, browser()->tab_count());
1328 EXPECT_EQ(1, panel_browser->tab_count()); 1329 EXPECT_EQ(1, panel_browser->tab_count());
1329 } 1330 }
1330 1331
1331 } // namespace 1332 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698