First step towards invalidations componentization

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_logger.h"
-#include "chrome/browser/invalidation/invalidation_service.h"
+#include "components/invalidation/invalidation_logger.h"
+#include "components/invalidation/invalidation_service.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::NotNull;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 using ::testing::_;
 
@@ skipping 181 matching lines @@
 
   // An unrelated object should be unaffected by all the above.
   syncer::ObjectIdInvalidationMap map5;
   map5.Insert(syncer::Invalidation::Init(id3, 1, "1"));
   EXPECT_CALL(delegate_, OnMessage("dddddddddddddddddddddddddddddddd", 3, "1"));
   handler_->OnIncomingInvalidation(map5);
   testing::Mock::VerifyAndClearExpectations(&delegate_);
 }
 
 }  // namespace extensions