Introduce ProfileInvalidationProvider wrapper for InvalidationService

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 "testing/gtest/include/gtest/gtest.h"
 
 namespace invalidation {
 
 class MockInvalidationControllerAndroid : public InvalidationControllerAndroid {
  public:
   MockInvalidationControllerAndroid() {}
   virtual ~MockInvalidationControllerAndroid() {}
 
   virtual void SetRegisteredObjectIds(const syncer::ObjectIdSet& ids) OVERRIDE {
     registered_ids_ = ids;
   }
 
   syncer::ObjectIdSet registered_ids_;
 };
 
 class InvalidationServiceAndroidTestDelegate {
  public:
-  InvalidationServiceAndroidTestDelegate() { }
+  InvalidationServiceAndroidTestDelegate() {}
 
-  ~InvalidationServiceAndroidTestDelegate() {
-    DestroyInvalidationService();
-  }
+  ~InvalidationServiceAndroidTestDelegate() {}
 
   void CreateInvalidationService() {
     profile_.reset(new TestingProfile());
     invalidation_service_android_.reset(
         new InvalidationServiceAndroid(
             profile_.get(),
             new MockInvalidationControllerAndroid()));
   }
 
   InvalidationService* GetInvalidationService() {
     return invalidation_service_android_.get();
   }
 
   void DestroyInvalidationService() {
-    invalidation_service_android_->Shutdown();
+    invalidation_service_android_.reset();
   }
 
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
     invalidation_service_android_->TriggerStateChangeForTest(state);
   }
 
   void TriggerOnIncomingInvalidation(
       const syncer::ObjectIdInvalidationMap& invalidation_map) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
         content::Source<Profile>(profile_.get()),
         content::Details<const syncer::ObjectIdInvalidationMap>(
             &invalidation_map));
   }
 
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<InvalidationServiceAndroid> invalidation_service_android_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     AndroidInvalidationServiceTest, InvalidationServiceTest,
     InvalidationServiceAndroidTestDelegate);
 
 class InvalidationServiceAndroidRegistrationTest : public testing::Test {
  protected:
   InvalidationServiceAndroidRegistrationTest()
       : invalidation_controller_(new MockInvalidationControllerAndroid()),
         invalidation_service_(&profile_, invalidation_controller_) {}
 
-  virtual ~InvalidationServiceAndroidRegistrationTest() {
-    invalidation_service_.Shutdown();
-  }
+  virtual ~InvalidationServiceAndroidRegistrationTest() {}
 
   // Get the invalidation service being tested.
   InvalidationService& invalidation_service() {
     return invalidation_service_;
   }
 
   // Get the number of objects which are registered.
   size_t RegisteredObjectCount() {
     return registered_ids().size();
   }
@@ skipping 73 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