Removing whispernet_client() by merging its functionality with GetWhispernetClient().

chrome/browser/extensions/api/copresence/copresence_api.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/extensions/api/copresence/copresence_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
@@ skipping 53 matching lines @@
   manager_.reset();
   whispernet_client_.reset();
 }
 
 copresence::CopresenceManager* CopresenceService::manager() {
   if (!manager_ && !is_shutting_down_)
     manager_.reset(new copresence::CopresenceManagerImpl(this));
   return manager_.get();
 }
 
-audio_modem::WhispernetClient* CopresenceService::whispernet_client() {
-  if (!whispernet_client_ && !is_shutting_down_)
-    whispernet_client_.reset(new ChromeWhispernetClient(browser_context_));
-  return whispernet_client_.get();
-}
-
 const std::string CopresenceService::auth_token(const std::string& app_id)
     const {
   // This won't be const if we use map[]
   const auto& key = auth_tokens_by_app_.find(app_id);
   return key == auth_tokens_by_app_.end() ? std::string() : key->second;
 }
 
 void CopresenceService::set_api_key(const std::string& app_id,
                                     const std::string& api_key) {
   DCHECK(!app_id.empty());
@@ skipping 108 matching lines @@
         static_cast<CopresenceManifestData*>(
             extension->GetManifestData(manifest_keys::kCopresence));
     if (manifest_data)
       return manifest_data->api_key;
   }
 
   return std::string();
 }
 
 audio_modem::WhispernetClient* CopresenceService::GetWhispernetClient() {
-  return whispernet_client();
+  if (!whispernet_client_ && !is_shutting_down_)
+    whispernet_client_.reset(new ChromeWhispernetClient(browser_context_));
+  return whispernet_client_.get();
 }
 
 gcm::GCMDriver* CopresenceService::GetGCMDriver() {
   gcm::GCMProfileService* gcm_service =
       gcm::GCMProfileServiceFactory::GetForProfile(browser_context_);
   return gcm_service ? gcm_service->driver() : nullptr;
 }
 
 const std::string CopresenceService::GetDeviceId(bool authenticated) {
   std::string id = GetPrefService()->GetString(GetPrefName(authenticated));
@@ skipping 79 matching lines @@
   scoped_ptr<SetAuthToken::Params> params(SetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   // The token may be set to empty, to clear it.
   CopresenceService::GetFactoryInstance()->Get(browser_context())
       ->set_auth_token(extension_id(), params->token);
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions