Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/ui/webui/invalidations_message_handler.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/ui/webui/invalidations_message_handler.h"
 
 #include "base/bind.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/invalidation/invalidation_logger.h"
 #include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/profile_invalidation_provider.h"
 #include "content/public/browser/web_ui.h"
 #include "sync/notifier/invalidation_handler.h"
 
 namespace invalidation {
 class InvalidationLogger;
 }  // namespace invalidation
 
 namespace syncer {
 class ObjectIdInvalidationMap;
 }  // namespace syncer
@@ skipping 11 matching lines @@
       "doneLoading",
       base::Bind(&InvalidationsMessageHandler::UIReady,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "requestDetailedStatus",
       base::Bind(&InvalidationsMessageHandler::HandleRequestDetailedStatus,
                  base::Unretained(this)));
 }
 
 void InvalidationsMessageHandler::UIReady(const base::ListValue* args) {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromWebUI(web_ui()));
-  if (invalidation_service)
-    logger_ = invalidation_service->GetInvalidationLogger();
+  if (invalidation_provider) {
+    logger_ = invalidation_provider->GetInvalidationService()->
+        GetInvalidationLogger();
+  }
   if (logger_ && !logger_->IsObserverRegistered(this))
     logger_->RegisterObserver(this);
   UpdateContent(args);
 }
 
 void InvalidationsMessageHandler::HandleRequestDetailedStatus(
     const base::ListValue* args) {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromWebUI(web_ui()));
-  if (invalidation_service) {
-    invalidation_service->RequestDetailedStatus(base::Bind(
-        &InvalidationsMessageHandler::OnDetailedStatus,
-        weak_ptr_factory_.GetWeakPtr()));
+  if (invalidation_provider) {
+    invalidation_provider->GetInvalidationService()->RequestDetailedStatus(
+        base::Bind(&InvalidationsMessageHandler::OnDetailedStatus,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void InvalidationsMessageHandler::UpdateContent(const base::ListValue* args) {
   if (logger_)
     logger_->EmitContent();
 }
 
 void InvalidationsMessageHandler::OnRegistrationChange(
     const std::multiset<std::string>& registered_handlers) {
@@ skipping 41 matching lines @@
   scoped_ptr<base::ListValue> invalidations_list = new_invalidations.ToValue();
   web_ui()->CallJavascriptFunction("chrome.invalidations.logInvalidations",
                                    *invalidations_list);
 }
 
 void InvalidationsMessageHandler::OnDetailedStatus(
     const base::DictionaryValue& network_details) {
   web_ui()->CallJavascriptFunction("chrome.invalidations.updateDetailedStatus",
                                    network_details);
 }