Always use arc::InstanceHolder<T>::GetInstanceForMethod

chrome/browser/chromeos/arc/arc_settings_service.cc

 // Copyright 2015 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/arc/arc_settings_service.h"
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/json/json_writer.h"
@@ skipping 20 matching lines @@
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "net/proxy/proxy_config.h"
 
 using ::chromeos::CrosSettings;
 using ::chromeos::system::TimezoneSettings;
 
 namespace {
 
+constexpr uint32_t kMinVersionForSendBroadcast = 1;
+
 bool GetHttpProxyServer(const ProxyConfigDictionary* proxy_config_dict,
                         std::string* host,
                         int* port) {
   std::string proxy_rules_string;
   if (!proxy_config_dict->GetProxyServer(&proxy_rules_string))
     return false;
 
   net::ProxyConfig::ProxyRules proxy_rules;
   proxy_rules.ParseFromString(proxy_rules_string);
 
@@ skipping 398 matching lines @@
 
 void ArcSettingsServiceImpl::SyncLocationServiceEnabled() const {
   SendBoolPrefSettingsBroadcast(
       prefs::kArcLocationServiceEnabled,
       "org.chromium.arc.intent_helper.SET_LOCATION_SERVICE_ENABLED");
 }
 
 void ArcSettingsServiceImpl::SendSettingsBroadcast(
     const std::string& action,
     const base::DictionaryValue& extras) const {
-  if (!arc_bridge_service_->intent_helper()->instance()) {
-    LOG(ERROR) << "IntentHelper instance is not ready.";
+  auto* instance = arc_bridge_service_->intent_helper()->GetInstanceForMethod(
+      "SendBroadcast", kMinVersionForSendBroadcast);
+  if (!instance)
     return;
-  }
-
   std::string extras_json;
   bool write_success = base::JSONWriter::Write(extras, &extras_json);
   DCHECK(write_success);
 
-  if (arc_bridge_service_->intent_helper()->version() >= 1) {
-    arc_bridge_service_->intent_helper()->instance()->SendBroadcast(
-        action, "org.chromium.arc.intent_helper",
-        "org.chromium.arc.intent_helper.SettingsReceiver", extras_json);
-  }
+  instance->SendBroadcast(action, "org.chromium.arc.intent_helper",
+                          "org.chromium.arc.intent_helper.SettingsReceiver",
+                          extras_json);
 }
 
 void ArcSettingsServiceImpl::DefaultNetworkChanged(
     const chromeos::NetworkState* network) {
   // kProxy pref and ONC policy have more priority than the default network
   // update.
   Profile* profile = ProfileManager::GetActiveUserProfile();
   if (!chromeos::onc::HasPolicyForNetwork(
           profile->GetPrefs(), g_browser_process->local_state(), *network) &&
       !IsPrefProxyConfigApplied()) {
@@ skipping 12 matching lines @@
 
 void ArcSettingsService::OnInstanceReady() {
   impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service()));
 }
 
 void ArcSettingsService::OnInstanceClosed() {
   impl_.reset();
 }
 
 }  // namespace arc