Revert of Move some sync/notifier to components/invalidation

chrome/browser/invalidation/invalidation_service_android_unittest.cc

 // Copyright (c) 2013 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/invalidation/invalidation_service_android.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/invalidation/fake_invalidation_handler.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/notifier/fake_invalidation_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace invalidation {
 
 class MockInvalidationControllerAndroid : public InvalidationControllerAndroid {
  public:
   MockInvalidationControllerAndroid() {}
   virtual ~MockInvalidationControllerAndroid() {}
 
   virtual void SetRegisteredObjectIds(const syncer::ObjectIdSet& ids) OVERRIDE {
@@ skipping 143 matching lines @@
   ASSERT_FALSE(id1.empty());
 
   // If nothing else, the ID should be consistent.
   const std::string id2 = invalidation_service().GetInvalidatorClientId();
   ASSERT_EQ(id1, id2);
 }
 
 #endif
 
 }  // namespace invalidation