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

Unified Diff: chrome/browser/ui/app_list/app_list_controller_browsertest.cc

Issue 61553005: Disable ShowAppListBrowserTest.ShowAppListFlag on win. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_controller_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
index 6279157a3219b27d9a28b0848ab40d5d30ea5860..92068035f9752609c0a6689726a2302d9f722ba8 100644
--- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
@@ -191,7 +191,14 @@ class ShowAppListBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(ShowAppListBrowserTest);
};
-IN_PROC_BROWSER_TEST_F(ShowAppListBrowserTest, ShowAppListFlag) {
+// See http://crbug.com/315677
+#if defined(OS_WIN)
+#define MAYBE_ShowAppListFlag DISABLED_ShowAppListFlag
+#else
+#define MAYBE_ShowAppListFlag ShowAppListFlag
+#endif
+
+IN_PROC_BROWSER_TEST_F(ShowAppListBrowserTest, MAYBE_ShowAppListFlag) {
AppListService* service = GetAppListService();
// The app list should already be shown because we passed
// switches::kShowAppList.
« 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