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

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

Issue 2143893002: Purge the App Launcher code from Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
index 6c150812077dc1557be0cf40b14918d22d8d2ffe..60c1c3907c304a0dd93692955db33e4c2055eab8 100644
--- a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
@@ -22,6 +22,7 @@
#include "ui/app_list/views/app_list_main_view.h"
#include "ui/app_list/views/app_list_view.h"
#include "ui/app_list/views/contents_view.h"
+#include "ui/app_list/views/test/app_list_view_test_api.h"
#include "ui/events/test/event_generator.h"
#include "ui/views/widget/widget.h"
@@ -43,27 +44,6 @@ app_list::AppListView* GetAppListView(AppListService* service) {
} // namespace
-namespace test {
-
-// Allow access to private variables of the AppListView for testing.
-class AppListViewTestApi {
- public:
- explicit AppListViewTestApi(app_list::AppListView* view) : view_(view) {}
- virtual ~AppListViewTestApi() {}
-
- bool is_overlay_visible() {
- DCHECK(view_->overlay_view_);
- return view_->overlay_view_->visible();
- }
-
- private:
- app_list::AppListView* view_;
-
- DISALLOW_COPY_AND_ASSIGN(AppListViewTestApi);
-};
-
-} // namespace test
-
// Browser Test for AppListService on Views platforms.
typedef InProcessBrowserTest AppListServiceViewsBrowserTest;
@@ -100,8 +80,8 @@ IN_PROC_BROWSER_TEST_F(AppListServiceViewsBrowserTest, NativeClose) {
// Dismiss the app list via an accelerator when it is the only thing keeping
// Chrome alive and expect everything to clean up properly. This is a regression
// test for http://crbug.com/395937.
-// Flaky on Win and Linux. https://crbug.com/477697
-#if defined(OS_WIN) || defined(OS_LINUX)
+// Flaky on Linux. https://crbug.com/477697
+#if defined(OS_LINUX)
#define MAYBE_AcceleratorClose DISABLED_AcceleratorClose
#else
#define MAYBE_AcceleratorClose AcceleratorClose

Powered by Google App Engine
This is Rietveld 408576698