Tests for the Copresence API.

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 53ab40134f194f822011a7c70ca6299441301255..6b08eb4df126dbb5dd9f75972cef6d69ea2f2380 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc
@@ -41,8 +41,10 @@ CopresenceService::~CopresenceService() {
 }
 
 copresence::CopresenceClient* CopresenceService::client() {
-  if (!client_)
-    client_.reset(new copresence::CopresenceClient(this));
+  if (!client_) {
+    client_.reset(new copresence::CopresenceClient);
+    client_->Initialize(this);
+  }
   return client_.get();
 }
 
@@ -57,6 +59,11 @@ void CopresenceService::Shutdown() {
     client_->Shutdown();
 }
 
+void CopresenceService::set_client_for_testing(
+    scoped_ptr<copresence::CopresenceClient> client) {
+  client_ = client.Pass();
+}
+
 // static
 BrowserContextKeyedAPIFactory<CopresenceService>*
 CopresenceService::GetFactoryInstance() {
@@ -111,7 +118,7 @@ const std::string CopresenceService::GetPlatformVersionString() const {
 }
 
 copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {
-  return whispernet_client_.get();
+  return whispernet_client();
 }
 
 template <>