Move more utility functions to arc_util.

chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.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/chromeos/app_mode/arc/arc_kiosk_app_manager.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
-#include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_util.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 132 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void ArcKioskAppManager::RemoveObserver(ArcKioskAppManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ArcKioskAppManager::UpdateApps() {
   // Do not populate ARC kiosk apps if ARC apps can't be run on the device.
   // Apps won't be added to kiosk Apps menu and won't be auto-launched.
-  if (!arc::ArcBridgeService::GetEnabled(
-          base::CommandLine::ForCurrentProcess())) {
+  if (!arc::util::IsArcEnabled()) {
     VLOG(1) << "Device doesn't support ARC apps, don't populate ARC kiosk apps";
     return;
   }
 
   // Store current apps. We will compare old and new apps to determine which
   // apps are new, and which were deleted.
   ArcKioskApps old_apps(std::move(apps_));
 
   auto_launch_account_id_.clear();
   std::string auto_login_account_id_from_settings;
@@ skipping 60 matching lines @@
           cryptohome_id, base::Bind(&OnRemoveAppCryptohomeComplete,
                                     cryptohome_id, base::Closure()));
     }
   }
 
   if (active_user_to_be_deleted)
     chrome::AttemptUserExit();
 }
 
 }  // namespace chromeos