Moved methods that don't rely on internal state out of ChromeLauncherController.

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 31 matching lines @@
 #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/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"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 213 matching lines @@
         new ChromeLauncherAppMenuItem(base::string16(), NULL, false));
     items.push_back(
         new ChromeLauncherAppMenuItem(base::string16(), NULL, false));
     return items;
   }
   ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override {
     return NULL;
   }
   bool IsDraggable() override { return false; }
   bool CanPin() const override {
-    return launcher_controller()->GetPinnable(app_id()) ==
+    return GetPinnableForAppID(app_id(), launcher_controller()->GetProfile()) ==
            AppListControllerDelegate::PIN_EDITABLE;
   }
   bool ShouldShowTooltip() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController);
 };
 
 }  // namespace
 
@@ skipping 1028 matching lines @@
   // 2 is not pinned as it's not installed
   EXPECT_FALSE(launcher_controller_->IsAppPinned(extension2_->id()));
   EXPECT_TRUE(launcher_controller_->IsAppPinned(extension3_->id()));
   EXPECT_TRUE(launcher_controller_->IsAppPinned(extension4_->id()));
   // install extension 2 and check
   extension_service_->AddExtension(extension2_.get());
   EXPECT_TRUE(launcher_controller_->IsAppPinned(extension2_->id()));
 
   // Check user can manually pin or unpin these apps
   EXPECT_EQ(AppListControllerDelegate::PIN_EDITABLE,
-            launcher_controller_->GetPinnable(extension1_->id()));
+            GetPinnableForAppID(extension1_->id(),
+                                launcher_controller_->GetProfile()));

[msw, 2016/06/27 18:50:26]

nit: use profile() (or cache this for the 4 uses here).

   EXPECT_EQ(AppListControllerDelegate::PIN_FIXED,
-            launcher_controller_->GetPinnable(extension2_->id()));
+            GetPinnableForAppID(extension2_->id(),
+                                launcher_controller_->GetProfile()));
   EXPECT_EQ(AppListControllerDelegate::PIN_EDITABLE,
-            launcher_controller_->GetPinnable(extension3_->id()));
+            GetPinnableForAppID(extension3_->id(),
+                                launcher_controller_->GetProfile()));
   EXPECT_EQ(AppListControllerDelegate::PIN_FIXED,
-            launcher_controller_->GetPinnable(extension4_->id()));
+            GetPinnableForAppID(extension4_->id(),
+                                launcher_controller_->GetProfile()));
 
   // Check the order of shelf pinned apps
   EXPECT_EQ("AppList, App2, App4, App1, Chrome, App3", GetPinnedAppStatus());
 }
 
 // Check that the restauration of launcher items is happening in the same order
 // as the user has pinned them (on another system) when they are synced reverse
 // order.
 TEST_F(ChromeLauncherControllerImplTest, RestoreDefaultAppsReverseOrder) {
   InitLauncherController();
@@ skipping 2017 matching lines @@
   // Set policy, that makes pins ARC app. Unlike native extension, for ARC app
   // package_name (not hash) specified as id. In this test we check that
   // by hash we can determine that appropriate package was set by policy.
   base::ListValue policy_value;
   InsertPrefValue(&policy_value, 0, appinfo.package_name);
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kPolicyPinnedLauncherApps, policy_value.DeepCopy());
 
   EXPECT_TRUE(launcher_controller_->IsAppPinned(app_id));
   EXPECT_EQ(AppListControllerDelegate::PIN_FIXED,
-            launcher_controller_->GetPinnable(app_id));
+            GetPinnableForAppID(app_id, launcher_controller_->GetProfile()));

[msw, 2016/06/27 18:50:26]

nit: use profile().

 }
 
 TEST_F(ChromeLauncherControllerImplTest, ArcManaged) {
   extension_service_->AddExtension(arc_support_host_.get());
   arc_test_.SetUp(profile());
   // Test enables Arc, so turn it off for initial values.
   EnableArc(false);
 
   InitLauncherController();
   arc::ArcAuthService::SetShelfDelegateForTesting(launcher_controller_.get());
@@ skipping 32 matching lines @@
   // be automatically removed.
   EnableArc(false);
   ValidateArcState(false, false, arc::ArcAuthService::State::STOPPED,
                    "AppList, Chrome");
 
   // Even if re-enable it again, Play Store pin does not appear automatically.
   EnableArc(true);
   ValidateArcState(true, false, arc::ArcAuthService::State::FETCHING_CODE,
                    "AppList, Chrome");
 }