Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / copresence / copresence_api.cc

diff --git a/src/chrome/browser/extensions/api/copresence/copresence_api.cc b/src/chrome/browser/extensions/api/copresence/copresence_api.cc
index c5a3f51..61749b8 100644 (file)
--- a/src/chrome/browser/extensions/api/copresence/copresence_api.cc
+++ b/src/chrome/browser/extensions/api/copresence/copresence_api.cc
@@ -12,7 +12,7 @@
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/enums.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
-#include "components/copresence/public/copresence_client.h"
+#include "components/copresence/public/copresence_manager.h"
 #include "components/copresence/public/whispernet_client.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/event_router.h"
@@ -21,7 +21,7 @@ namespace extensions {
 
 namespace {
 
-base::LazyInstance<BrowserContextKeyedAPIFactory<CopresenceService> >
+base::LazyInstance<BrowserContextKeyedAPIFactory<CopresenceService>>
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 const char kInvalidOperationsMessage[] =
@@ -37,10 +37,10 @@ CopresenceService::CopresenceService(content::BrowserContext* context)
 
 CopresenceService::~CopresenceService() {}
 
-copresence::CopresenceClient* CopresenceService::client() {
-  if (!client_ && !is_shutting_down_)
-    client_.reset(new copresence::CopresenceClient(this));
-  return client_.get();
+copresence::CopresenceManager* CopresenceService::manager() {
+  if (!manager_ && !is_shutting_down_)
+    manager_ = copresence::CopresenceManager::Create(this);
+  return manager_.get();
 }
 
 copresence::WhispernetClient* CopresenceService::whispernet_client() {
@@ -51,10 +51,15 @@ copresence::WhispernetClient* CopresenceService::whispernet_client() {
 
 void CopresenceService::Shutdown() {
   is_shutting_down_ = true;
-  client_.reset();
+  manager_.reset();
   whispernet_client_.reset();
 }
 
+void CopresenceService::set_manager_for_testing(
+    scoped_ptr<copresence::CopresenceManager> manager) {
+  manager_ = manager.Pass();
+}
+
 // static
 BrowserContextKeyedAPIFactory<CopresenceService>*
 CopresenceService::GetFactoryInstance() {
@@ -76,7 +81,7 @@ void CopresenceService::HandleMessages(
   }
 
   int message_count = messages.size();
-  std::vector<linked_ptr<api::copresence::Message> > api_messages(
+  std::vector<linked_ptr<api::copresence::Message>> api_messages(
       message_count);
 
   for (int m = 0; m < message_count; ++m) {
@@ -131,8 +136,8 @@ ExtensionFunction::ResponseAction CopresenceExecuteFunction::Run() {
       CopresenceService::GetFactoryInstance()->Get(browser_context());
 
   // This can only happen if we're shutting down. In all other cases, if we
-  // don't have a client, we'll create one.
-  if (!service->client())
+  // don't have a manager, we'll create one.
+  if (!service->manager())
     return RespondNow(Error(kShuttingDownMessage));
 
   // Each execute will correspond to one ReportRequest protocol buffer.
@@ -144,7 +149,7 @@ ExtensionFunction::ResponseAction CopresenceExecuteFunction::Run() {
     return RespondNow(Error(kInvalidOperationsMessage));
   }
 
-  service->client()->ExecuteReportRequest(
+  service->manager()->ExecuteReportRequest(
       request,
       extension_id(),
       base::Bind(&CopresenceExecuteFunction::SendResult, this));