Add the Copresence API.

chrome/browser/extensions/api/copresence_private/copresence_private_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_private/copresence_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
+#include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/common/extensions/api/copresence_private.h"
 #include "components/copresence/public/whispernet_client.h"
 #include "media/base/audio_bus.h"
 
 namespace extensions {
 
-// This code is only for testing while we don't have the rest of the
-// CopresenceAPI service which will actually give us the whispernet client.
-// Once we add that code, both the g_whispernet_client and the
-// GetWhispernetClient function will go away, to be replaced by the
-// GetWhispernetClient function that will fetch our active whispernet client
-// from the CopresenceAPI profile keyed service.
-copresence::WhispernetClient* g_whispernet_client = NULL;
-
 // Copresence Private functions.
 
 copresence::WhispernetClient* CopresencePrivateFunction::GetWhispernetClient() {
-  // This is temporary code, this needs to be replaced by the real
-  // GetWhispernetClient code from c/b/e/api/copresence/copresence_util.h
-  DCHECK(g_whispernet_client);
-  return g_whispernet_client;
+  CopresenceService* service =
+      CopresenceService::GetFactoryInstance()->Get(browser_context());
+  return service ? service->whispernet_client() : NULL;
 }
 
 // CopresenceSendFoundFunction implementation:
 ExtensionFunction::ResponseAction CopresencePrivateSendFoundFunction::Run() {
   if (!GetWhispernetClient() ||
       GetWhispernetClient()->GetTokensCallback().is_null()) {
     return RespondNow(NoArguments());
   }
 
   scoped_ptr<api::copresence_private::SendFound::Params> params(
@@ skipping 50 matching lines @@
   }
 
   scoped_ptr<api::copresence_private::SendInitialized::Params> params(
       api::copresence_private::SendInitialized::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GetWhispernetClient()->GetInitializedCallback().Run(params->success);
   return RespondNow(NoArguments());
 }
 
-void SetWhispernetClientForTesting(copresence::WhispernetClient* client) {
-  g_whispernet_client = client;
-}
-
 }  // namespace extensions