arc: Add support of default and OEM apps.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 33 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 428 matching lines @@
     ash::ShelfItem app_list;
     app_list.type = ash::TYPE_APP_LIST;
     model_->Add(app_list);
   }
 
   void InitLauncherController() {
     AddAppListLauncherItem();
     launcher_controller_.reset(
         new ChromeLauncherControllerImpl(profile(), model_.get()));
     launcher_controller_->Init();
+    ChromeLauncherController::set_instance(launcher_controller_.get());
   }
 
   void InitLauncherControllerWithBrowser() {
     InitLauncherController();
     chrome::NewTab(browser());
     browser()->window()->Show();
   }
 
   void RecreateChromeLauncher() {
     // Destroy controller first if it exists.
     launcher_controller_.reset();
     model_.reset(new ash::ShelfModel);
     AddAppListLauncherItem();
     launcher_controller_.reset(
         ChromeLauncherControllerImpl::CreateInstance(profile(), model_.get()));
     launcher_controller_->Init();
+    ChromeLauncherController::set_instance(launcher_controller_.get());
   }
 
   void StartAppSyncService(const syncer::SyncDataList& init_sync_list) {
     app_service_->MergeDataAndStartSyncing(
         syncer::APP_LIST, init_sync_list,
         base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
         base::WrapUnique(new syncer::SyncErrorFactoryMock()));
     EXPECT_EQ(init_sync_list.size(), app_service_->sync_items().size());
   }
 
@@ skipping 3010 matching lines @@
 
   views::Widget* window_none_ = nullptr;
   views::Widget* window_landscape_ = nullptr;
   views::Widget* window_portrait_ = nullptr;
   views::Widget* window_current_ = nullptr;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerOrientationTest);
 };
 
+class ChromeLauncherControllerArcDefaultAppsTest
+    : public ChromeLauncherControllerImplTest {
+ public:
+  ChromeLauncherControllerArcDefaultAppsTest() {}
+  ~ChromeLauncherControllerArcDefaultAppsTest() override {}
+
+ protected:
+  void SetUp() override {
+    ArcAppListPrefs::UseTestDefaultAppsDirectory();
+    ChromeLauncherControllerImplTest::SetUp();
+  }
+
+  void TestMe() {

[xiyuan, 2016/08/26 19:32:30]

nit: This function seems unnecessary if it is not shared with other test cases?

[khmel, 2016/08/26 23:26:18]

Oh, forgot to move into TEST_F(ChromeLauncherControllerArcDefaultAppsTest,
DefaultApps).
My IDE does not work well with this construction so I use temp function to
implement initial functionality.

+    arc_test_.SetUp(profile());
+    InitLauncherController();
+
+    ArcAppListPrefs* const prefs = arc_test_.arc_app_list_prefs();
+    EnableArc(false);
+    EXPECT_FALSE(arc_test_.arc_auth_service()->IsArcEnabled());
+    ASSERT_TRUE(prefs->GetAppIds().size());
+
+    const std::string app_id =
+        ArcAppTest::GetAppId(arc_test_.fake_default_apps()[0]);
+    EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));
+    EXPECT_TRUE(arc::LaunchApp(profile(), app_id));
+    EXPECT_TRUE(arc_test_.arc_auth_service()->IsArcEnabled());
+    EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+
+    // Stop Arc again. Shelf item should go away.
+    EnableArc(false);
+    EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));
+
+    EXPECT_TRUE(arc::LaunchApp(profile(), app_id));
+    EXPECT_TRUE(arc_test_.arc_auth_service()->IsArcEnabled());
+
+    EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+    EXPECT_TRUE(launcher_controller_->GetArcDeferredLauncher()->HasApp(app_id));
+
+    std::string window_app_id("org.chromium.arc.1");
+    CreateArcWindow(window_app_id);
+    arc_test_.app_instance()->SendTaskCreated(1,
+                                              arc_test_.fake_default_apps()[0]);
+
+    EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+    EXPECT_FALSE(
+        launcher_controller_->GetArcDeferredLauncher()->HasApp(app_id));
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerArcDefaultAppsTest);
+};
+
 }  // namespace
 
 TEST_F(ChromeLauncherControllerOrientationTest, ArcOrientationLock) {
   ASSERT_TRUE(display::Display::HasInternalDisplay());
 
   extension_service_->AddExtension(arc_support_host_.get());
   arc_test_.SetUp(profile());
   EnableArc(true);
   EnableTabletMode(true);
 
@@ skipping 143 matching lines @@
   EXPECT_FALSE(controller->rotation_locked());
   EXPECT_EQ(display::Display::ROTATE_0,
             display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
 
   NotifyOnTaskOrientationLockRequested(task_id_current_,
                                        OrientationLock::CURRENT);
   EXPECT_TRUE(controller->rotation_locked());
   EXPECT_EQ(display::Display::ROTATE_0,
             display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
 }
+
+TEST_F(ChromeLauncherControllerArcDefaultAppsTest, DefaultApps) {
+  TestMe();
+}