Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/invalidation/invalidation_service_android_unittest.cc

Index: chrome/browser/invalidation/invalidation_service_android_unittest.cc
diff --git a/chrome/browser/invalidation/invalidation_service_android_unittest.cc b/chrome/browser/invalidation/invalidation_service_android_unittest.cc
index 1aaf9815add50c057595db3bb3caa036db780863..ab5e75c15d0b6a6af507a1172b6b66bc60944343 100644
--- a/chrome/browser/invalidation/invalidation_service_android_unittest.cc
+++ b/chrome/browser/invalidation/invalidation_service_android_unittest.cc
@@ -6,7 +6,6 @@
 
 #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"
@@ -29,11 +28,9 @@ class MockInvalidationControllerAndroid : public InvalidationControllerAndroid {
 
 class InvalidationServiceAndroidTestDelegate {
  public:
-  InvalidationServiceAndroidTestDelegate() { }
+  InvalidationServiceAndroidTestDelegate() {}
 
-  ~InvalidationServiceAndroidTestDelegate() {
-    DestroyInvalidationService();
-  }
+  ~InvalidationServiceAndroidTestDelegate() {}
 
   void CreateInvalidationService() {
     profile_.reset(new TestingProfile());
@@ -48,7 +45,7 @@ class InvalidationServiceAndroidTestDelegate {
   }
 
   void DestroyInvalidationService() {
-    invalidation_service_android_->Shutdown();
+    invalidation_service_android_.reset();
   }
 
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
@@ -78,9 +75,7 @@ class InvalidationServiceAndroidRegistrationTest : public testing::Test {
       : 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() {