[Invalidations] Add GetInvalidatorState() to Invalidator{,Frontend}

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/sync/invalidation_frontend.h"
@@ skipping 18 matching lines @@
 class MockInvalidationFrontend : public InvalidationFrontend {
  public:
   MockInvalidationFrontend();
   ~MockInvalidationFrontend();
   MOCK_METHOD1(RegisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
   MOCK_METHOD2(UpdateRegisteredInvalidationIds,
                void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&));
   MOCK_METHOD1(UnregisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
+  MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInvalidationFrontend);
 };
 
 MockInvalidationFrontend::MockInvalidationFrontend() {}
 MockInvalidationFrontend::~MockInvalidationFrontend() {}
 
 class MockInvalidationHandlerDelegate
     : public PushMessagingInvalidationHandlerDelegate {
@@ skipping 107 matching lines @@
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "U/dddddddddddddddddddddddddddddddd/0"));
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "U/dddddddddddddddddddddddddddddddd/3"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 0, "payload"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 3, "payload"));
-  handler_->OnIncomingNotification(ObjectIdSetToStateMap(ids, "payload"),
-                                   syncer::REMOTE_NOTIFICATION);
+  handler_->OnIncomingInvalidation(ObjectIdSetToStateMap(ids, "payload"),
+                                   syncer::REMOTE_INVALIDATION);
 }
 
 // Tests that malformed object IDs don't trigger spurious callbacks.
 TEST_F(PushMessagingInvalidationHandlerTest, DispatchInvalidObjectIds) {
   syncer::ObjectIdSet ids;
   // Completely incorrect format.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::TEST,
       "Invalid"));
   // Incorrect source.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::TEST,
       "U/dddddddddddddddddddddddddddddddd/3"));
   // Incorrect format type.
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "V/dddddddddddddddddddddddddddddddd/3"));
   // Invalid extension ID length.
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "U/ddddddddddddddddddddddddddddddddd/3"));
   // Non-numeric subchannel.
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "U/dddddddddddddddddddddddddddddddd/z"));
   // Subchannel out of range.
   ids.insert(invalidation::ObjectId(
       kSourceId,
       "U/dddddddddddddddddddddddddddddddd/4"));
-  handler_->OnIncomingNotification(ObjectIdSetToStateMap(ids, "payload"),
-                                   syncer::REMOTE_NOTIFICATION);
+  handler_->OnIncomingInvalidation(ObjectIdSetToStateMap(ids, "payload"),
+                                   syncer::REMOTE_INVALIDATION);
 }
 
 }  // namespace extensions