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

Side by Side Diff: chrome/browser/ui/views/search_view_controller_browsertest.cc

Issue 10917295: Marking SearchViewControllerTest.NTPToNativeSuggestions as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« 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/views/search_view_controller.h" 5 #include "chrome/browser/ui/views/search_view_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 // Initial state. 170 // Initial state.
171 EXPECT_TRUE(browser()->search_model()->mode().is_default()); 171 EXPECT_TRUE(browser()->search_model()->mode().is_default());
172 ASSERT_NE(static_cast<SearchViewController*>(NULL), controller()); 172 ASSERT_NE(static_cast<SearchViewController*>(NULL), controller());
173 173
174 AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_LINK); 174 AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_LINK);
175 EXPECT_TRUE(browser()->search_model()->mode().is_ntp()); 175 EXPECT_TRUE(browser()->search_model()->mode().is_ntp());
176 EXPECT_TRUE(controller_state_is_ntp()); 176 EXPECT_TRUE(controller_state_is_ntp());
177 } 177 }
178 178
179 // crbug.com/149939
179 IN_PROC_BROWSER_TEST_F(SearchViewControllerTest, 180 IN_PROC_BROWSER_TEST_F(SearchViewControllerTest,
180 MAYBE(NTPToNativeSuggestions)) { 181 MAYBE(FLAKY_NTPToNativeSuggestions)) {
181 AVOID_TEST_ON_BRANDED_CHROME(); 182 AVOID_TEST_ON_BRANDED_CHROME();
182 183
183 // Initial state. 184 // Initial state.
184 EXPECT_TRUE(browser()->search_model()->mode().is_default()); 185 EXPECT_TRUE(browser()->search_model()->mode().is_default());
185 ASSERT_NE(static_cast<SearchViewController*>(NULL), controller()); 186 ASSERT_NE(static_cast<SearchViewController*>(NULL), controller());
186 187
187 // Get to NTP. 188 // Get to NTP.
188 AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_LINK); 189 AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_LINK);
189 EXPECT_TRUE(browser()->search_model()->mode().is_ntp()); 190 EXPECT_TRUE(browser()->search_model()->mode().is_ntp());
190 EXPECT_TRUE(controller_state_is_ntp()); 191 EXPECT_TRUE(controller_state_is_ntp());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // Expect that the |ntp_container_| layer is hidden. 245 // Expect that the |ntp_container_| layer is hidden.
245 EXPECT_FALSE(controller_ntp_container_is_visible()); 246 EXPECT_FALSE(controller_ntp_container_is_visible());
246 247
247 // Expect that the |contents_container_| overlay exists and but is invisible. 248 // Expect that the |contents_container_| overlay exists and but is invisible.
248 ASSERT_TRUE(controller_contents_has_overlay()); 249 ASSERT_TRUE(controller_contents_has_overlay());
249 EXPECT_FALSE(controller_contents_overlay_visible()); 250 EXPECT_FALSE(controller_contents_overlay_visible());
250 } 251 }
251 252
252 } // namespace search 253 } // namespace search
253 } // namespace chrome 254 } // namespace chrome
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