Move more utility functions to arc_util.

chrome/browser/ui/extensions/app_launch_params.cc

 // Copyright 2014 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/extensions/app_launch_params.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "ui/base/window_open_disposition.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/arc/arc_session_manager.h"
-#include "components/arc/arc_bridge_service.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
+#include "components/arc/arc_util.h"
 #endif
 
 using extensions::ExtensionPrefs;
 using extensions::api::app_runtime::PlayStoreStatus;
 
 AppLaunchParams::AppLaunchParams(Profile* profile,
                                  const extensions::Extension* extension,
                                  extensions::LaunchContainer container,
                                  WindowOpenDisposition disposition,
                                  extensions::AppLaunchSource source,
                                  bool set_playstore_status)
     : profile(profile),
       extension_id(extension ? extension->id() : std::string()),
       container(container),
       disposition(disposition),
       command_line(base::CommandLine::NO_PROGRAM),
       source(source),
       play_store_status(PlayStoreStatus::PLAY_STORE_STATUS_UNKNOWN) {
 #if defined(OS_CHROMEOS)
   if (set_playstore_status) {
-    if (arc::ArcSessionManager::IsAllowedForProfile(profile)) {
+    if (arc::util::IsArcAllowedForProfile(profile)) {

[Luis Héctor Chávez, 2017/01/19 18:09:15]

nit: maybe elide braces? Not sure how that plays with the comment in L42. Up to
you.

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

I couldn't find any guideline, and I think I've rarely seen dropping braces in
chromium if there is else clause (though, I do not have stats...). For now, let
me keep this as is.

       play_store_status = PlayStoreStatus::PLAY_STORE_STATUS_ENABLED;
-    } else if (arc::ArcBridgeService::GetAvailable(
-                   base::CommandLine::ForCurrentProcess())) {
+    } else if (arc::util::IsArcAvailable()) {
       play_store_status = PlayStoreStatus::PLAY_STORE_STATUS_AVAILABLE;
     }  // else, default to PLAY_STORE_STATUS_UNKNOWN.
   }
 #endif
 }
 
 AppLaunchParams::AppLaunchParams(const AppLaunchParams& other) = default;
 
 AppLaunchParams::~AppLaunchParams() {}
 
@@ skipping 28 matching lines @@
     disposition = raw_disposition;
   } else {
     // Look at preference to find the right launch container.  If no preference
     // is set, launch as a regular tab.
     container =
         extensions::GetLaunchContainer(ExtensionPrefs::Get(profile), extension);
     disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
   }
   return AppLaunchParams(profile, extension, container, disposition, source);
 }