Remove explicit singletonness of ArcBridgeService part 3.

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/shell_delegate.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/interfaces/new_window.mojom.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/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::kArcIntentHelperPackageName[] =
@@ skipping 96 matching lines @@
   }
   return handlers_filtered;
 }
 
 // static
 mojom::IntentHelperInstance*
 ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
     const std::string& method_name_for_logging,
     uint32_t min_instance_version,
     GetResult* out_error_code) {
-  ArcBridgeService* bridge_service = ArcBridgeService::Get();
-  if (!bridge_service) {
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager) {
     if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {
       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.";
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     }
     return nullptr;
   }
 
-  if (!bridge_service->intent_helper()->has_instance()) {
+  auto* intent_helper =

[Luis Héctor Chávez, 2016/12/06 18:55:00]

nit: maybe intent_helper_holder? instance_holder?

[hidehiko, 2016/12/06 19:11:28]

Thank you for suggestion. Replaced by intent_helper_holder.

+      arc_service_manager->arc_bridge_service()->intent_helper();
+  if (!intent_helper->has_instance()) {
     VLOG(2) << "ARC intent helper instance is not ready.";
     if (out_error_code)
       *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     return nullptr;
   }
 
-  auto* instance = bridge_service->intent_helper()->GetInstanceForMethod(
-      method_name_for_logging, min_instance_version);
+  auto* instance = intent_helper->GetInstanceForMethod(method_name_for_logging,
+                                                       min_instance_version);
   if (!instance) {
     if (out_error_code)
       *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
     return nullptr;
   }
   return instance;
 }
 
 // static
 mojom::IntentHelperInstance* ArcIntentHelperBridge::GetIntentHelperInstance(
     const std::string& method_name_for_logging,
     uint32_t min_instance_version) {
   return GetIntentHelperInstanceWithErrorCode(method_name_for_logging,
                                               min_instance_version, nullptr);
 }
 
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
     std::vector<mojom::IntentFilterPtr> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 
   for (auto& observer : observer_list_)
     observer.OnAppsUpdated();
 }
 
 }  // namespace arc