Extract kArcEnabled preference from ArcSessionManager part 1.

chrome/browser/ui/app_list/arc/arc_app_utils.cc

 // Copyright 2016 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/app_list/arc/arc_app_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/common/intent_helper.mojom.h"
@@ skipping 233 matching lines @@
   return LaunchApp(context, app_id, kUseLandscapeLayout, event_flags);
 }
 
 bool LaunchApp(content::BrowserContext* context,
                const std::string& app_id,
                bool landscape_layout,
                int event_flags) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (app_info && !app_info->ready) {
-    ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
-    DCHECK(arc_session_manager);
-
-    bool arc_activated = false;
-    if (!arc_session_manager->IsArcPlayStoreEnabled()) {
+    Profile* profile = Profile::FromBrowserContext(context);
+    bool play_store_activated = false;
+    if (!IsArcPlayStoreEnabledForProfile(profile)) {
       if (!prefs->IsDefault(app_id)) {
         NOTREACHED();
         return false;
       }
 
-      arc_session_manager->SetArcPlayStoreEnabled(true);
-      if (!arc_session_manager->IsArcPlayStoreEnabled()) {
+      SetArcPlayStoreEnabledForProfile(profile, true);
+      if (!IsArcPlayStoreEnabledForProfile(profile)) {
         NOTREACHED();
         return false;
       }
-      arc_activated = true;
+      play_store_activated = true;
     }
 
     // PlayStore item has special handling for shelf controllers. In order to
     // avoid unwanted initial animation for PlayStore item do not create
-    // deferred launch request when PlayStore item enables ARC.
-    if (!arc_activated || app_id != kPlayStoreAppId) {
+    // deferred launch request when PlayStore item enables Google Play Store.
+    if (!play_store_activated || app_id != kPlayStoreAppId) {
       ChromeLauncherController* chrome_controller =
           ChromeLauncherController::instance();
       DCHECK(chrome_controller || !ash::Shell::HasInstance());
       if (chrome_controller) {
         chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(
             app_id, event_flags);
 
         // On some boards, ARC is booted with a restricted set of resources by
         // default to avoid slowing down Chrome's user session restoration.
         // However, the restriction should be lifted once the user explicitly
@@ skipping 135 matching lines @@
     return false;
 
   const ArcAppListPrefs* const arc_prefs = ArcAppListPrefs::Get(context);
   if (!arc_prefs)
     return false;
 
   return arc_prefs->IsRegistered(ArcAppShelfId::FromString(id).app_id());
 }
 
 }  // namespace arc