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

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.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 "google/cacheinvalidation/types.pb.h"
 #include "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::NotNull;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace extensions {
 
 namespace {
 
-class MockInvalidationService : public invalidation::InvalidationService {
+class MockInvalidationFrontend : public invalidation::InvalidationFrontend {
  public:
-  MockInvalidationService();
-  ~MockInvalidationService();
+  MockInvalidationFrontend();
+  ~MockInvalidationFrontend();
   MOCK_METHOD1(RegisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
   MOCK_METHOD2(UpdateRegisteredInvalidationIds,
                void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&));
   MOCK_METHOD1(UnregisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
   MOCK_METHOD2(AcknowledgeInvalidation, void(const invalidation::ObjectId&,
                                              const syncer::AckHandle&));
   MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());
-  MOCK_CONST_METHOD0(GetInvalidatorClientId, std::string());
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MockInvalidationService);
+  DISALLOW_COPY_AND_ASSIGN(MockInvalidationFrontend);
 };
 
-MockInvalidationService::MockInvalidationService() {}
-MockInvalidationService::~MockInvalidationService() {}
+MockInvalidationFrontend::MockInvalidationFrontend() {}
+MockInvalidationFrontend::~MockInvalidationFrontend() {}
 
 class MockInvalidationHandlerDelegate
     : public PushMessagingInvalidationHandlerDelegate {
  public:
   MockInvalidationHandlerDelegate();
   ~MockInvalidationHandlerDelegate();
   MOCK_METHOD3(OnMessage,
                void(const std::string&, int, const std::string&));
 
  private:
@@ skipping 12 matching lines @@
     EXPECT_CALL(service_, RegisterInvalidationHandler(NotNull()))
         .WillOnce(SaveArg<0>(&handler));
     handler_.reset(new PushMessagingInvalidationHandler(
         &service_, &delegate_));
     EXPECT_EQ(handler_.get(), handler);
   }
   virtual void TearDown() OVERRIDE {
     EXPECT_CALL(service_, UnregisterInvalidationHandler(handler_.get()));
     handler_.reset();
   }
-  StrictMock<MockInvalidationService> service_;
+  StrictMock<MockInvalidationFrontend> service_;
   StrictMock<MockInvalidationHandlerDelegate> delegate_;
   scoped_ptr<PushMessagingInvalidationHandler> handler_;
 };
 
 TEST_F(PushMessagingInvalidationHandlerTest, RegisterUnregisterExtension) {
   syncer::ObjectIdSet expected_ids;
   expected_ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/cccccccccccccccccccccccccccccccc/0"));
   expected_ids.insert(invalidation::ObjectId(
@@ skipping 66 matching lines @@
   for (syncer::ObjectIdSet::const_iterator it = ids.begin(); it != ids.end();
        ++it) {
     EXPECT_CALL(service_, AcknowledgeInvalidation(
         *it, syncer::AckHandle::InvalidAckHandle()));
   }
   handler_->OnIncomingInvalidation(
       ObjectIdSetToInvalidationMap(ids, "payload"));
 }
 
 }  // namespace extensions