Add the Copresence API.

chrome/browser/copresence/chrome_whispernet_client_browsertest.cc

Index: chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
diff --git a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
index 469a42d2f14b50d268535cca7fb2c6bce59c84a4..eeedbd4434a6757bf36b58b502d9fa35283baeda 100644
--- a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
+++ b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
-#include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
+#include "chrome/browser/extensions/api/copresence/copresence_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -40,50 +40,47 @@ std::string AudioBusToString(scoped_refptr<media::AudioBusRefCounted> source) {
 
 class ChromeWhispernetClientTest : public ExtensionBrowserTest {
  public:
-  ChromeWhispernetClientTest() : initialized_(false) {}
+  ChromeWhispernetClientTest() : context_(NULL), initialized_(false) {}
 
-  virtual ~ChromeWhispernetClientTest() {
-    if (client_)
-      extensions::SetWhispernetClientForTesting(NULL);
-  }
+  virtual ~ChromeWhispernetClientTest() {}
 
   void InitializeWhispernet() {
+    context_ = browser()->profile();
     run_loop_.reset(new base::RunLoop());
-    client_.reset(new ChromeWhispernetClient(browser()->profile()));
-    extensions::SetWhispernetClientForTesting(client_.get());
-
-    client_->Initialize(base::Bind(&ChromeWhispernetClientTest::InitCallback,
-                                   base::Unretained(this)));
+    extensions::GetWhispernetClient(context_)->Initialize(base::Bind(
+        &ChromeWhispernetClientTest::InitCallback, base::Unretained(this)));
     run_loop_->Run();
 
     EXPECT_TRUE(initialized_);
   }
 
   void EncodeTokenAndSaveSamples() {
-    ASSERT_TRUE(client_);
+    ASSERT_TRUE(extensions::GetWhispernetClient(context_));
 
-    // This is the base64 encoding for 000000.
+    // This is the base64 encoding for "000000".
     const std::string kZeroToken = "MDAwMDAw";
 
     run_loop_.reset(new base::RunLoop());
-    client_->RegisterSamplesCallback(base::Bind(
-        &ChromeWhispernetClientTest::SamplesCallback, base::Unretained(this)));
+    extensions::GetWhispernetClient(context_)->RegisterSamplesCallback(
+        base::Bind(&ChromeWhispernetClientTest::SamplesCallback,
+                   base::Unretained(this)));
     expected_token_ = kZeroToken;
 
-    client_->EncodeToken(kZeroToken);
+    extensions::GetWhispernetClient(context_)->EncodeToken(kZeroToken);
     run_loop_->Run();
 
     EXPECT_GT(saved_samples_->frames(), 0);
   }
 
   void DecodeSamplesAndVerifyToken() {
-    ASSERT_TRUE(client_);
+    ASSERT_TRUE(extensions::GetWhispernetClient(context_));
 
     const std::string kZeroToken = "MDAwMDAw";
 
     run_loop_.reset(new base::RunLoop());
-    client_->RegisterTokensCallback(base::Bind(
-        &ChromeWhispernetClientTest::TokensCallback, base::Unretained(this)));
+    extensions::GetWhispernetClient(context_)->RegisterTokensCallback(
+        base::Bind(&ChromeWhispernetClientTest::TokensCallback,
+                   base::Unretained(this)));
     expected_token_ = kZeroToken;
 
     ASSERT_GT(saved_samples_->frames(), 0);
@@ -99,18 +96,19 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest {
            saved_samples_->channel(0),
            sizeof(float) * saved_samples_->frames());
 
-    client_->DecodeSamples(AudioBusToString(samples_bus));
+    extensions::GetWhispernetClient(context_)
+        ->DecodeSamples(AudioBusToString(samples_bus));
     run_loop_->Run();
   }
 
   void DetectBroadcast() {
-    ASSERT_TRUE(client_);
+    ASSERT_TRUE(extensions::GetWhispernetClient(context_));
 
     run_loop_.reset(new base::RunLoop());
-    client_->RegisterDetectBroadcastCallback(
+    extensions::GetWhispernetClient(context_)->RegisterDetectBroadcastCallback(
         base::Bind(&ChromeWhispernetClientTest::DetectBroadcastCallback,
                    base::Unretained(this)));
-    client_->DetectBroadcast();
+    extensions::GetWhispernetClient(context_)->DetectBroadcast();
     run_loop_->Run();
   }
 
@@ -146,7 +144,7 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest {
 
  private:
   scoped_ptr<base::RunLoop> run_loop_;
-  scoped_ptr<ChromeWhispernetClient> client_;
+  content::BrowserContext* context_;
 
   std::string expected_token_;
   scoped_refptr<media::AudioBusRefCounted> saved_samples_;