MacViews: Changes to allow app_list_unittests to compile

ui/app_list/views/app_list_view_unittest.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 "ui/app_list/views/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_switcher_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/app_list/views/tile_item_view.h"
-#include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/window.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace app_list {
 namespace test {
 
 namespace {
 
@@ skipping 20 matching lines @@
   return count;
 }
 
 // Choose a set that is 3 regular app list pages and 2 landscape app list pages.
 const int kInitialItems = 34;
 
 // Allows the same tests to run with different contexts: either an Ash-style
 // root window or a desktop window tree host.
 class AppListViewTestContext {
  public:
-  AppListViewTestContext(int test_type, aura::Window* parent);
+  AppListViewTestContext(int test_type, gfx::NativeView parent);
   ~AppListViewTestContext();
 
   // Test displaying the app list and performs a standard set of checks on its
   // top level views. Then closes the window.
   void RunDisplayTest();
 
   // Hides and reshows the app list with a folder open, expecting the main grid
   // view to be shown.
   void RunReshowWithOpenFolderTest();
 
@@ skipping 62 matching lines @@
   // Overridden from app_list::test::AppListTestViewDelegate:
   virtual void ViewClosing() OVERRIDE { parent_->NativeWidgetClosing(); }
 
  private:
   AppListViewTestContext* parent_;
 
   DISALLOW_COPY_AND_ASSIGN(UnitTestViewDelegate);
 };
 
 AppListViewTestContext::AppListViewTestContext(int test_type,
-                                               aura::Window* parent)
+                                               gfx::NativeView parent)
     : test_type_(static_cast<TestType>(test_type)) {
   switch (test_type_) {
     case NORMAL:
       break;
     case LANDSCAPE:
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kEnableCenteredAppList);
       break;
     case EXPERIMENTAL:
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 359 matching lines @@
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestAura() {}
   virtual ~AppListViewTestAura() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
-    test_context_.reset(new AppListViewTestContext(GetParam(), GetContext()));
+
+    // On Ash (only) the app list is placed into an aura::Window "container",
+    // which is also used to determine the context. In tests, use the ash root
+    // window as the parent. This only works on aura where the root window is a
+    // NativeView as well as a NativeWindow.
+    gfx::NativeView container = NULL;
+#if defined(USE_AURA)
+    container = GetContext();
+#endif
+
+    test_context_.reset(new AppListViewTestContext(GetParam(), container));
   }
 
   virtual void TearDown() OVERRIDE {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   scoped_ptr<AppListViewTestContext> test_context_;
 
@@ skipping 120 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list