Redesign the copresence audio handlers.

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>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/copresence/copresence_translations.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/common/extensions/api/copresence.h"
 #include "components/copresence/public/copresence_delegate.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 
+class ChromeWhispernetClient;
+
 namespace copresence {
 class CopresenceManager;
 class WhispernetClient;
 }
 
 namespace extensions {
 
 class CopresenceService : public BrowserContextKeyedAPI,
                           public copresence::CopresenceDelegate {
  public:
@@ skipping 38 matching lines @@
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "CopresenceService"; }
 
   bool is_shutting_down_;
   std::map<std::string, std::string> apps_by_subscription_id_;
 
   content::BrowserContext* const browser_context_;
   std::string api_key_;
 
   scoped_ptr<copresence::CopresenceManager> manager_;
-  scoped_ptr<copresence::WhispernetClient> whispernet_client_;
+  scoped_ptr<ChromeWhispernetClient> whispernet_client_;
 
   DISALLOW_COPY_AND_ASSIGN(CopresenceService);
 };
 
 template <>
 void BrowserContextKeyedAPIFactory<
     CopresenceService>::DeclareFactoryDependencies();
 
 class CopresenceExecuteFunction : public ChromeUIThreadExtensionFunction {
  public:
@@ skipping 12 matching lines @@
   DECLARE_EXTENSION_FUNCTION("copresence.setApiKey", COPRESENCE_SETAPIKEY);
 
  protected:
   virtual ~CopresenceSetApiKeyFunction() {}
   virtual ExtensionFunction::ResponseAction Run() override;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_