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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc

Issue 2252263002: Disable flaky test TestClickingOnOverflowedAction on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable flaky test TestClickingOnOverflowedAction on Windows Created 4 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
« 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/location.h" 5 #include "base/location.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // are constructed. 162 // are constructed.
163 feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride( 163 feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
164 extensions::FeatureSwitch::extension_action_redesign(), true)); 164 extensions::FeatureSwitch::extension_action_redesign(), true));
165 ToolbarActionsBar::disable_animations_for_testing_ = true; 165 ToolbarActionsBar::disable_animations_for_testing_ = true;
166 } 166 }
167 167
168 void ToolbarActionViewInteractiveUITest::TearDownOnMainThread() { 168 void ToolbarActionViewInteractiveUITest::TearDownOnMainThread() {
169 ToolbarActionsBar::disable_animations_for_testing_ = false; 169 ToolbarActionsBar::disable_animations_for_testing_ = false;
170 } 170 }
171 171
172 #if defined(USE_OZONE) 172 #if defined(USE_OZONE) || defined(OS_WIN)
173 // ozone bringup - http://crbug.com/401304 173 // ozone bringup - http://crbug.com/401304
174 // flaky on Windows - http://crbug.com/638692
174 #define MAYBE_TestClickingOnOverflowedAction DISABLED_TestClickingOnOverflowedAc tion 175 #define MAYBE_TestClickingOnOverflowedAction DISABLED_TestClickingOnOverflowedAc tion
175 #else 176 #else
176 #define MAYBE_TestClickingOnOverflowedAction TestClickingOnOverflowedAction 177 #define MAYBE_TestClickingOnOverflowedAction TestClickingOnOverflowedAction
177 #endif 178 #endif
178 // Tests clicking on an overflowed extension action. 179 // Tests clicking on an overflowed extension action.
179 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, 180 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
180 MAYBE_TestClickingOnOverflowedAction) { 181 MAYBE_TestClickingOnOverflowedAction) {
181 // Load an extension. 182 // Load an extension.
182 ASSERT_TRUE(LoadExtension( 183 ASSERT_TRUE(LoadExtension(
183 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); 184 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup")));
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 ui_controls::SendKeyPressNotifyWhenDone(native_window, ui::VKEY_RETURN, false, 388 ui_controls::SendKeyPressNotifyWhenDone(native_window, ui::VKEY_RETURN, false,
388 false, false, false, 389 false, false, false,
389 loop.QuitClosure()); 390 loop.QuitClosure());
390 loop.Run(); 391 loop.Run();
391 392
392 // The menu should be closed. 393 // The menu should be closed.
393 EXPECT_FALSE(app_menu_button->IsMenuShowing()); 394 EXPECT_FALSE(app_menu_button->IsMenuShowing());
394 // And the extension should have been activated. 395 // And the extension should have been activated.
395 EXPECT_TRUE(listener.WaitUntilSatisfied()); 396 EXPECT_TRUE(listener.WaitUntilSatisfied());
396 } 397 }
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