Revert 208315 "Make use of InvalidationService"

trunk/src/chrome/browser/invalidation/invalidation_service_android_unittest.cc

Index: trunk/src/chrome/browser/invalidation/invalidation_service_android_unittest.cc
===================================================================
--- trunk/src/chrome/browser/invalidation/invalidation_service_android_unittest.cc	(revision 208346)
+++ trunk/src/chrome/browser/invalidation/invalidation_service_android_unittest.cc	(working copy)
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/invalidation/invalidation_service_android.h"
 
+#include "chrome/browser/invalidation/invalidation_frontend_test_template.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
-#include "chrome/browser/invalidation/invalidation_service_test_template.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
@@ -18,20 +18,20 @@
   InvalidationServiceAndroidTestDelegate() { }
 
   ~InvalidationServiceAndroidTestDelegate() {
-    DestroyInvalidationService();
+    DestroyInvalidationFrontend();
   }
 
-  void CreateInvalidationService() {
+  void CreateInvalidationFrontend() {
     profile_.reset(new TestingProfile());
     invalidation_service_android_.reset(
         new InvalidationServiceAndroid(profile_.get()));
   }
 
-  InvalidationService* GetInvalidationService() {
+  InvalidationFrontend* GetInvalidationFrontend() {
     return invalidation_service_android_.get();
   }
 
-  void DestroyInvalidationService() {
+  void DestroyInvalidationFrontend() {
     invalidation_service_android_->Shutdown();
   }
 
@@ -55,7 +55,7 @@
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
-    AndroidInvalidationServiceTest, InvalidationServiceTest,
+    AndroidInvalidationServiceTest, InvalidationFrontendTest,
     InvalidationServiceAndroidTestDelegate);
 
 }  // namespace invalidation