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

Side by Side Diff: chrome/browser/ui/webui/bookmarks_ui_uitest.cc

Issue 7584009: Marked BookmarksUITest.CommandAgainGoesBackToBookmarksTab flaky. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/test/ui/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "chrome/test/automation/automation_proxy.h" 10 #include "chrome/test/automation/automation_proxy.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ASSERT_EQ(1, tab_count); 95 ASSERT_EQ(1, tab_count);
96 96
97 scoped_refptr<TabProxy> tab = browser->GetActiveTab(); 97 scoped_refptr<TabProxy> tab = browser->GetActiveTab();
98 ASSERT_TRUE(tab.get()); 98 ASSERT_TRUE(tab.get());
99 99
100 ASSERT_TRUE(WaitForBookmarksUI(tab)); 100 ASSERT_TRUE(WaitForBookmarksUI(tab));
101 101
102 AssertIsBookmarksPage(tab); 102 AssertIsBookmarksPage(tab);
103 } 103 }
104 104
105 TEST_F(BookmarksUITest, CommandAgainGoesBackToBookmarksTab) { 105 // http://crbug.com/91843
106 #if defined(OS_LINUX)
107 #define MAYBE_CommandAgainGoesBackToBookmarksTab FLAKY_CommandAgainGoesBackToBoo kmarksTab
108 #else
109 #define MAYBE_CommandAgainGoesBackToBookmarksTab CommandAgainGoesBackToBookmarks Tab
110 #endif
111
112 TEST_F(BookmarksUITest, MAYBE_CommandAgainGoesBackToBookmarksTab) {
106 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 113 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
107 ASSERT_TRUE(browser.get()); 114 ASSERT_TRUE(browser.get());
108 115
109 int tab_count = -1; 116 int tab_count = -1;
110 ASSERT_TRUE(browser->GetTabCount(&tab_count)); 117 ASSERT_TRUE(browser->GetTabCount(&tab_count));
111 NavigateToURL(GURL("http://www.google.com/")); 118 NavigateToURL(GURL("http://www.google.com/"));
112 ASSERT_EQ(1, tab_count); 119 ASSERT_EQ(1, tab_count);
113 120
114 // Bring up the bookmarks manager tab. 121 // Bring up the bookmarks manager tab.
115 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER)); 122 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER)); 154 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
148 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER)); 155 ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
149 ASSERT_TRUE(browser->GetTabCount(&tab_count)); 156 ASSERT_TRUE(browser->GetTabCount(&tab_count));
150 ASSERT_EQ(1, tab_count); 157 ASSERT_EQ(1, tab_count);
151 } 158 }
152 159
153 TEST_F(BookmarksUITest, BookmarksLoaded) { 160 TEST_F(BookmarksUITest, BookmarksLoaded) {
154 scoped_refptr<TabProxy> tab = GetBookmarksUITab(); 161 scoped_refptr<TabProxy> tab = GetBookmarksUITab();
155 ASSERT_TRUE(tab.get()); 162 ASSERT_TRUE(tab.get());
156 } 163 }
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