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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_browsertest.cc

Issue 8566004: Mark AutocompleteBrowserTest.Basic flaky on Win and Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 "base/format_macros.h" 5 #include "base/format_macros.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/autocomplete/autocomplete.h" 9 #include "chrome/browser/autocomplete/autocomplete.h"
10 #include "chrome/browser/autocomplete/autocomplete_edit.h" 10 #include "chrome/browser/autocomplete/autocomplete_edit.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 LocationBar* GetLocationBar() const { 59 LocationBar* GetLocationBar() const {
60 return browser()->window()->GetLocationBar(); 60 return browser()->window()->GetLocationBar();
61 } 61 }
62 62
63 AutocompleteController* GetAutocompleteController() const { 63 AutocompleteController* GetAutocompleteController() const {
64 return GetLocationBar()->location_entry()->model()->popup_model()-> 64 return GetLocationBar()->location_entry()->model()->popup_model()->
65 autocomplete_controller(); 65 autocomplete_controller();
66 } 66 }
67 }; 67 };
68 68
69 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) { 69 #if defined(OS_WIN) || defined(OS_LINUX)
70 #define MAYBE_Basic FLAKY_Basic
71 #else
72 #define MAYBE_Basic Basic
73 #endif
74 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
70 LocationBar* location_bar = GetLocationBar(); 75 LocationBar* location_bar = GetLocationBar();
71 76
72 EXPECT_TRUE(location_bar->GetInputString().empty()); 77 EXPECT_TRUE(location_bar->GetInputString().empty());
73 EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), 78 EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
74 location_bar->location_entry()->GetText()); 79 location_bar->location_entry()->GetText());
75 // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across 80 // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
76 // platforms. 81 // platforms.
77 82
78 location_bar->FocusLocation(true); 83 location_bar->FocusLocation(true);
79 84
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 const AutocompleteResult& result = autocomplete_controller->result(); 320 const AutocompleteResult& result = autocomplete_controller->result();
316 // 'App test' is also a substring of extension 'Packaged App Test'. 321 // 'App test' is also a substring of extension 'Packaged App Test'.
317 EXPECT_GT(result.size(), 2U) << AutocompleteResultAsString(result); 322 EXPECT_GT(result.size(), 2U) << AutocompleteResultAsString(result);
318 AutocompleteMatch match = result.match_at(0); 323 AutocompleteMatch match = result.match_at(0);
319 EXPECT_EQ(ASCIIToUTF16("App Test"), match.contents); 324 EXPECT_EQ(ASCIIToUTF16("App Test"), match.contents);
320 EXPECT_EQ(AutocompleteMatch::EXTENSION_APP, match.type); 325 EXPECT_EQ(AutocompleteMatch::EXTENSION_APP, match.type);
321 EXPECT_FALSE(match.deletable); 326 EXPECT_FALSE(match.deletable);
322 location_bar->AcceptInput(); 327 location_bar->AcceptInput();
323 } 328 }
324 } 329 }
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