Remove ArcSessionManager::SetShelfDelegateForTesting.

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 264 matching lines @@
     items.push_back(
         base::MakeUnique<ash::ShelfApplicationMenuItem>(base::string16()));
     return items;
   }
   void Close() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController);
 };
 
+// Proxies to ShelfDelegate invocation to the given
+// ChromeLauncherControllerImpl instance. Because of ownership management,
+// ChromeLauncherControllerImpl instance cannot be injected to WmShell.
+// This wraps the instance, so that it can be injected.
+class ProxyShelfDelegate : public ash::ShelfDelegate {
+ public:
+  explicit ProxyShelfDelegate(ChromeLauncherControllerImpl* controller)
+      : controller_(controller) {}
+  ~ProxyShelfDelegate() override = default;
+
+  ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override {
+    return controller_->GetShelfIDForAppID(app_id);
+  };
+
+  ash::ShelfID GetShelfIDForAppIDAndLaunchID(
+      const std::string& app_id,
+      const std::string& launch_id) override {
+    return controller_->GetShelfIDForAppIDAndLaunchID(app_id, launch_id);
+  }
+
+  bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override {
+    return controller_->HasShelfIDToAppIDMapping(id);
+  }
+
+  const std::string& GetAppIDForShelfID(ash::ShelfID id) override {
+    return controller_->GetAppIDForShelfID(id);
+  }
+
+  void PinAppWithID(const std::string& app_id) override {
+    return controller_->PinAppWithID(app_id);
+  }
+
+  bool IsAppPinned(const std::string& app_id) override {
+    return controller_->IsAppPinned(app_id);
+  }
+
+  void UnpinAppWithID(const std::string& app_id) override {
+    return controller_->UnpinAppWithID(app_id);
+  }
+
+ private:
+  ChromeLauncherControllerImpl* const controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProxyShelfDelegate);
+};
+
 }  // namespace
 
 class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {
  protected:
   ChromeLauncherControllerImplTest()
       : BrowserWithTestWindowTest(Browser::TYPE_TABBED, false) {}
 
   ~ChromeLauncherControllerImplTest() override {}
 
   void SetUp() override {
@@ skipping 206 matching lines @@
     // Destroy controller first if it exists.
     launcher_controller_.reset();
     while (model_->item_count() > 0)
       model_->RemoveItemAt(0);
     AddAppListLauncherItem();
     launcher_controller_ =
         base::MakeUnique<ChromeLauncherControllerImpl>(profile(), model_);
     launcher_controller_->Init();
   }
 
+  // This needs to be called after InitLaunchController(), or its family.
+  // It is not supported to recreate the instance.
+  void SetShelfDelegate() {
+    ash::WmShell::Get()->SetShelfDelegateForTesting(
+        base::MakeUnique<ProxyShelfDelegate>(launcher_controller_.get()));
+  }
+
   void StartAppSyncService(const syncer::SyncDataList& init_sync_list) {
     app_service_->MergeDataAndStartSyncing(
         syncer::APP_LIST, init_sync_list,
         base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
         base::MakeUnique<syncer::SyncErrorFactoryMock>());
     EXPECT_EQ(init_sync_list.size(), app_service_->sync_items().size());
   }
 
   void StopAppSyncService() { app_service_->StopSyncing(syncer::APP_LIST); }
 
@@ skipping 3058 matching lines @@
   extension_service_->AddExtension(arc_support_host_.get());
   // Test enables ARC, so turn it off for initial values.
   EnableArc(false);
 
   InitLauncherController();
 
   // To prevent import legacy pins each time.
   // Initially pins are imported from legacy pref based model.
   StartPrefSyncService(syncer::SyncDataList());
 
-  arc::ArcSessionManager::SetShelfDelegateForTesting(
-      launcher_controller_.get());
+  // Inject launcher_controller_ as ShelfDelegate to verify the behavior

[Luis Héctor Chávez, 2017/02/23 19:23:09]

nit: |launch_controller_|, "behavior of removing"

[hidehiko, 2017/02/24 05:42:11]

Done.

+  // to remove pinned icon in ArcSessionManager::OnOptInPreferenceChanged().
+  SetShelfDelegate();
 
   // Initial run, ARC is not managed and disabled, Play Store pin should be
   // available.
   ValidateArcState(false, false, arc::ArcSessionManager::State::STOPPED,
                    "AppList, Chrome, Play Store");
 
   // ARC is managed and enabled, Play Store pin should be available.
   // Note: SHOWING_TERMS_OF_SERVICE here means that opt-in flow starts.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kArcEnabled, new base::FundamentalValue(true));
@@ skipping 129 matching lines @@
 }  // namespace
 
 TEST_F(ChromeLauncherControllerOrientationTest,
        ArcOrientationLockBeforeWindowReady) {
   ASSERT_TRUE(display::Display::HasInternalDisplay());
 
   extension_service_->AddExtension(arc_support_host_.get());
   EnableArc(true);
 
   InitLauncherController();
-  arc::ArcSessionManager::SetShelfDelegateForTesting(
-      launcher_controller_.get());
 
   ash::ScreenOrientationController* controller =
       ash::Shell::GetInstance()->screen_orientation_controller();
 
   std::string app_id1("org.chromium.arc.1");
   int task_id1 = 1;
   arc::mojom::AppInfo appinfo1 =
       CreateAppInfo("Test1", "test", "com.example.app", OrientationLock::NONE);
 
   AddArcAppAndShortcut(appinfo1);
@@ skipping 30 matching lines @@
 }
 
 TEST_F(ChromeLauncherControllerOrientationTest, ArcOrientationLock) {
   ASSERT_TRUE(display::Display::HasInternalDisplay());
 
   extension_service_->AddExtension(arc_support_host_.get());
   EnableArc(true);
   EnableTabletMode(true);
 
   InitLauncherController();
-  arc::ArcSessionManager::SetShelfDelegateForTesting(
-      launcher_controller_.get());
 
   InitApps();
   ash::ScreenOrientationController* controller =
       ash::Shell::GetInstance()->screen_orientation_controller();
 
   // Activating a window with NON orientation unlocks the screen.
   window_none_->Activate();
   EXPECT_FALSE(controller->rotation_locked());
   EXPECT_EQ(display::Display::ROTATE_0,
             display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
@@ skipping 77 matching lines @@
 }
 
 TEST_F(ChromeLauncherControllerOrientationTest, CurrentWithLandscapeDisplay) {
   ASSERT_TRUE(display::Display::HasInternalDisplay());
 
   extension_service_->AddExtension(arc_support_host_.get());
   EnableArc(true);
   EnableTabletMode(true);
 
   InitLauncherController();
-  arc::ArcSessionManager::SetShelfDelegateForTesting(
-      launcher_controller_.get());
 
   InitApps();
   ash::ScreenOrientationController* controller =
       ash::Shell::GetInstance()->screen_orientation_controller();
 
   // Start with portrait.
   window_portrait_->Activate();
 
   // Create a arc window to lock the CURRENT orientation.
   views::Widget* window_current = CreateArcWindow(window_app_id_current_);
@@ skipping 37 matching lines @@
                                        OrientationLock::CURRENT);
   EXPECT_TRUE(controller->rotation_locked());
   EXPECT_EQ(display::Display::ROTATE_0,
             display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
 }
 
 TEST_F(ChromeLauncherControllerArcDefaultAppsTest, DefaultApps) {
   arc_test_.SetUp(profile());
   InitLauncherController();
   ChromeLauncherController::set_instance_for_test(launcher_controller_.get());
-  arc::ArcSessionManager::SetShelfDelegateForTesting(
-      launcher_controller_.get());
 
   ArcAppListPrefs* const prefs = arc_test_.arc_app_list_prefs();
   EnableArc(false);
   EXPECT_FALSE(arc::IsArcPlayStoreEnabledForProfile(profile()));
   ASSERT_TRUE(prefs->GetAppIds().size());
 
   const std::string app_id =
       ArcAppTest::GetAppId(arc_test_.fake_default_apps()[0]);
   EXPECT_EQ(ash::kInvalidShelfID,
             launcher_controller_->GetShelfIDForAppID(app_id));
@@ skipping 248 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shelf_controller->auto_hide());
   EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
 
   PrefService* prefs = profile()->GetTestingPrefService();
   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
 }