Move more utility functions to arc_util.

components/arc/intent_helper/arc_intent_helper_bridge.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 "components/arc/intent_helper/arc_intent_helper_bridge.h"
 
 #include <utility>
 
 #include "ash/common/new_window_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
-#include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
+#include "components/arc/arc_util.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/link_handler_model_impl.h"
 #include "components/arc/intent_helper/local_activity_resolver.h"
 #include "ui/base/layout.h"
 #include "url/gurl.h"
 
 namespace arc {
 
 // static
 const char ArcIntentHelperBridge::kArcServiceName[] =
@@ skipping 98 matching lines @@
       continue;
     handlers_filtered.push_back(std::move(handler));
   }
   return handlers_filtered;
 }
 
 // static
 bool ArcIntentHelperBridge::IsIntentHelperAvailable(GetResult* out_error_code) {
   auto* arc_service_manager = ArcServiceManager::Get();
   if (!arc_service_manager) {
-    if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {
-      VLOG(2) << "ARC bridge is not supported.";
+    if (!arc::util::IsArcEnabled()) {

[hidehiko, 2017/01/19 06:57:26]

FYI to yusukes@.

IIUC, this check is not up-to-date.
Nowadays on ChromeOS, ArcServiceManager instance should be created regardless of
--enable-arc flag. So, we should drop this check.
Also, if it is ok to merge the VLOG message at L141 into L151, we can simplify
the code.

Yusuke, WDYT? If it is ok for you, I'll make the change in a following CL.

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

That's fine but I also think we can remove the function itself by now along with
the enums. I can do that if needed.

+      VLOG(2) << "ARC service is not supported.";
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
     } else {
-      VLOG(2) << "ARC bridge is not ready.";
+      VLOG(2) << "ARC service is not ready.";
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     }
     return false;
   }
 
   auto* intent_helper_holder =
       arc_service_manager->arc_bridge_service()->intent_helper();
   if (!intent_helper_holder->has_instance()) {
     VLOG(2) << "ARC intent helper instance is not ready.";
     if (out_error_code)
       *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     return false;
   }
 
   return true;
 }
 
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
     std::vector<IntentFilter> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 
   for (auto& observer : observer_list_)
     observer.OnIntentFiltersUpdated();
 }
 
 }  // namespace arc