Move more utility functions to arc_util.

chrome/browser/chromeos/note_taking_helper.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/note_taking_helper.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "apps/launcher.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 83 matching lines @@
 
 NoteTakingAppInfos NoteTakingHelper::GetAvailableApps(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   NoteTakingAppInfos infos;
 
   const std::vector<const extensions::Extension*> chrome_apps =
       GetChromeApps(profile);
   for (const auto& app : chrome_apps)
     infos.push_back(NoteTakingAppInfo{app->name(), app->id(), false});
 
-  if (arc::ArcSessionManager::Get()->IsAllowedForProfile(profile))
+  if (arc::IsArcAllowedForProfile(profile))
     infos.insert(infos.end(), android_apps_.begin(), android_apps_.end());
 
   // Determine which app, if any, is preferred.
   const std::string pref_app_id =
       profile->GetPrefs()->GetString(prefs::kNoteTakingAppId);
   for (auto& info : infos) {
     if (info.app_id == pref_app_id) {
       info.preferred = true;
       break;
     }
@@ skipping 181 matching lines @@
 }
 
 NoteTakingHelper::LaunchResult NoteTakingHelper::LaunchAppInternal(
     Profile* profile,
     const std::string& app_id,
     const base::FilePath& path) {
   DCHECK(profile);
 
   if (LooksLikeAndroidPackageName(app_id)) {
     // Android app.
-    if (!arc::ArcSessionManager::Get()->IsAllowedForProfile(profile)) {
+    if (!arc::IsArcAllowedForProfile(profile)) {
       LOG(WARNING) << "Can't launch Android app " << app_id << " for profile";
       return LaunchResult::ANDROID_NOT_SUPPORTED_BY_PROFILE;
     }
     auto* helper = ARC_GET_INSTANCE_FOR_METHOD(
         arc::ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
         HandleIntent);
     if (!helper)
       return LaunchResult::ANDROID_NOT_RUNNING;
 
     GURL clip_data_uri;
@@ skipping 59 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos