Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

 // Copyright (c) 2012 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/push_messaging/push_messaging_invalidation_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
-#include "chrome/browser/invalidation/invalidation_service.h"
+#include "chrome/browser/invalidation/invalidation_frontend.h"
 #include "chrome/common/extensions/extension.h"
 #include "google/cacheinvalidation/types.pb.h"
 
 namespace extensions {
 
 namespace {
 
 const int kNumberOfSubchannels = 4;
 
 // Chrome push messaging object IDs currently have the following format:
@@ skipping 47 matching lines @@
   if (*subchannel < 0 || *subchannel >= kNumberOfSubchannels) {
     DLOG(WARNING) << "Subchannel out of range from object name " << name;
     return false;
   }
   return true;
 }
 
 }  // namespace
 
 PushMessagingInvalidationHandler::PushMessagingInvalidationHandler(
-    invalidation::InvalidationService* service,
+    invalidation::InvalidationFrontend* service,
     PushMessagingInvalidationHandlerDelegate* delegate)
     : service_(service),
       delegate_(delegate) {
   DCHECK(service_);
   service_->RegisterInvalidationHandler(this);
 }
 
 PushMessagingInvalidationHandler::~PushMessagingInvalidationHandler() {
   DCHECK(thread_checker_.CalledOnValidThread());
   service_->UnregisterInvalidationHandler(this);
@@ skipping 58 matching lines @@
   for (std::set<std::string>::const_iterator it =
        registered_extensions_.begin(); it != registered_extensions_.end();
        ++it) {
     const syncer::ObjectIdSet& object_ids = ExtensionIdToObjectIds(*it);
     ids.insert(object_ids.begin(), object_ids.end());
   }
   service_->UpdateRegisteredInvalidationIds(this, ids);
 }
 
 }  // namespace extensions