Move more utility functions to arc_util.

components/arc/arc_util.cc

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 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 "components/arc/arc_bridge_service.h"
-
-#include <utility>
+#include "components/arc/arc_util.h"
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/sequenced_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/user_manager/user_manager.h"
 
 namespace arc {
+namespace util {
 
 namespace {
 
 const base::Feature kArcEnabledFeature{"EnableARC",

[Yusuke Sato, 2017/01/19 22:39:31]

This is for finch experiment right? A short comment why this is needed in
addition to switches::kEnableArc might be helpful. 

[hidehiko, 2017/01/24 17:46:12]

Done.

                                        base::FEATURE_DISABLED_BY_DEFAULT};
 
 }  // namespace
 
-ArcBridgeService::ArcBridgeService() = default;
-
-ArcBridgeService::~ArcBridgeService() = default;
-
-// static
-bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) {
+bool IsArcEnabled() {
+  const auto* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(chromeos::switches::kEnableArc) ||
          (command_line->HasSwitch(chromeos::switches::kArcAvailable) &&
           base::FeatureList::IsEnabled(kArcEnabledFeature));
 }
 
-// static
-bool ArcBridgeService::GetAvailable(const base::CommandLine* command_line) {
+bool IsArcAvailable() {
+  const auto* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(chromeos::switches::kArcAvailable);
 }
 
+bool IsArcKioskMode() {
+  return user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp();
+}
+
+bool IsOptInVerificationDisabled() {
+  const auto* command_line = base::CommandLine::ForCurrentProcess();
+  return command_line->HasSwitch(
+      chromeos::switches::kDisableArcOptInVerification);
+}
+
+}  // namespace util
 }  // namespace arc