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"
 
@@ skipping 114 matching lines @@
     // availability. This happens only before MessageLoop starts or after
     // MessageLoop stops, practically.
     // Also, returning FAILED_ARC_NOT_READY looks problematic at the moment,
     // because ArcProcessTask::StartIconLoading accesses to
     // ArcServiceManager::Get() return value, which can be nullptr.
     if (!IsArcAvailable()) {
       VLOG(2) << "ARC bridge 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