Remove obsolete app_list Linux code.

chrome/browser/apps/custom_launcher_page_browsertest_views.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
-#include "chrome/browser/ui/app_list/app_list_service_views.h"
-#include "chrome/browser/ui/app_list/app_list_shower_views.h"
+#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/app_list/app_list_switches.h"
+#include "ui/app_list/presenter/app_list_presenter_impl.h"
 #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/custom_launcher_page_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
-#include "ui/app_list/presenter/app_list_presenter_impl.h"
-#endif
-
 namespace {
 
 // The path of the test application within the "platform_apps" directory.
 const char kCustomLauncherPagePath[] = "custom_launcher_page";
 
 // The app ID of the test application.
 const char kCustomLauncherPageID[] = "lmadimbbgapmngbiclpjjngmdickadpl";
 
 }  // namespace
 
@@ skipping 21 matching lines @@
   // Open the launcher. Ignores the Extension argument (this will simply
   // activate any loaded launcher pages).
   void LaunchPlatformApp(const extensions::Extension* /*unused*/) override {
     AppListService* service = AppListService::Get();
     DCHECK(service);
     service->ShowForProfile(browser()->profile());
   }
 
   app_list::AppListView* GetAppListView() {
     app_list::AppListView* app_list_view = nullptr;
-#if defined(OS_CHROMEOS)
     AppListServiceAshTestApi service_test;
     app_list_view = service_test.GetAppListView();
     EXPECT_TRUE(service_test.GetAppListPresenter()->GetTargetVisibility());
-#else
-    AppListServiceViews* service =
-        static_cast<AppListServiceViews*>(AppListService::Get());
-    // The app list should have loaded instantly since the profile is already
-    // loaded.
-    EXPECT_TRUE(service->IsAppListVisible());
-    app_list_view = service->shower().app_list();
-#endif
     return app_list_view;
   }
 
   // Set the active page on the app list, according to |state|. Does not wait
   // for any animation or custom page to complete.
   void SetActiveStateAndVerify(app_list::AppListModel::State state) {
     app_list::ContentsView* contents_view =
         GetAppListView()->app_list_main_view()->contents_view();
     contents_view->SetActiveState(state);
     EXPECT_TRUE(contents_view->IsStateActive(state));
@@ skipping 115 matching lines @@
   // Scroll down to open launcher page.
   event_generator.MoveMouseWheel(0, -5);
   EXPECT_TRUE(contents_view->IsStateActive(
       app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
 
   // Constants for gesture/trackpad events.
   const base::TimeDelta step_delay = base::TimeDelta::FromMilliseconds(300);
   const int num_steps = 5;
   const int num_fingers = 2;
 
-#if defined(OS_CHROMEOS)
   // Gesture events need to be in host coordinates. On Desktop platforms, the

[tapted, 2016/12/16 05:11:41]

nit: remove "On Desktop platforms.." sentence?

[Matt Giuca, 2016/12/21 06:18:03]

Done.

   // Widget is the host, so nothing needs to be done. On ChromeOS, the points
   // need to be put into screen coordinates. This works because the root window
   // assumes it fills the screen.
   point_in_clickzone = bounds.CenterPoint();
   point_above_clickzone.SetPoint(point_in_clickzone.x(), bounds.y() - 10);
   views::View::ConvertPointToScreen(contents_view, &point_above_clickzone);
   views::View::ConvertPointToScreen(contents_view, &point_in_clickzone);
-#endif
 
   // Back to the start page. And send a scroll gesture.
   SetActiveStateAndVerify(app_list::AppListModel::STATE_START);
   // Going down should do nothing.
   event_generator.GestureScrollSequence(
       point_above_clickzone, point_in_clickzone, step_delay, num_steps);
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Now go up - should change state.
   event_generator.GestureScrollSequence(
@@ skipping 212 matching lines @@
   // And in reverse.
   EXPECT_EQ(
       search_box_textfield,
       app_list_view->GetFocusManager()->GetNextFocusableView(
           custom_page_webview, custom_page_webview->GetWidget(), true, false));
   EXPECT_EQ(custom_page_webview,
             app_list_view->GetFocusManager()->GetNextFocusableView(
                 search_box_textfield, search_box_textfield->GetWidget(), true,
                 false));
 }