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

chrome/browser/extensions/api/copresence/copresence_api.cc

Index: chrome/browser/extensions/api/copresence/copresence_api.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_api.cc b/chrome/browser/extensions/api/copresence/copresence_api.cc
index 9eb1bb8a73b2e23f9667783e76f613643f616280..e742da841c91e24021cc62016501cc2d2df2be5f 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc
@@ -71,12 +71,6 @@ copresence::CopresenceManager* CopresenceService::manager() {
   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[]
@@ -205,7 +199,9 @@ CopresenceService::GetAPIKey(const std::string& app_id) const {
 }
 
 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() {