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

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 32 matching lines @@
   explicit CopresenceService(content::BrowserContext* context);
   ~CopresenceService() override;
 
   // BrowserContextKeyedAPI implementation.
   static const bool kServiceHasOwnInstanceInIncognito = true;
   void Shutdown() override;
 
   // These accessors will always return an object (except during shutdown).
   // If the object doesn't exist, they will create one first.
   copresence::CopresenceManager* manager();
-  // TODO(ckehoe): Merge this with GetWhispernetClient() below.
-  audio_modem::WhispernetClient* whispernet_client();
 
   // A registry containing the app id's associated with every subscription.
   SubscriptionToAppMap& apps_by_subscription_id() {
     return apps_by_subscription_id_;
   }
 
   const std::string auth_token(const std::string& app_id) const;
 
   void set_api_key(const std::string& app_id,
                    const std::string& api_key);
@@ skipping 81 matching lines @@
                              COPRESENCE_SETAUTHTOKEN);
 
  protected:
   ~CopresenceSetAuthTokenFunction() override {}
   ExtensionFunction::ResponseAction Run() override;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_