Reduce dependency of TiclInvalidationService on Profile

chrome/browser/invalidation/invalidator_storage_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/invalidation/invalidator_storage.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
@@ skipping 14 matching lines @@
   TestingPrefServiceSyncable pref_service_;
 };
 
 // Clearing the storage should erase all version map entries, bootstrap data,
 // and the client ID.
 TEST_F(InvalidatorStorageTest, Clear) {
   InvalidatorStorage storage(&pref_service_);
   EXPECT_TRUE(storage.GetBootstrapData().empty());
   EXPECT_TRUE(storage.GetInvalidatorClientId().empty());
 
-  storage.SetInvalidatorClientId("fake_id");
+  storage.ClearAndSetNewClientId("fake_id");
   EXPECT_EQ("fake_id", storage.GetInvalidatorClientId());
 
   storage.SetBootstrapData("test");
   EXPECT_EQ("test", storage.GetBootstrapData());
 
   storage.Clear();
 
   EXPECT_TRUE(storage.GetBootstrapData().empty());
   EXPECT_TRUE(storage.GetInvalidatorClientId().empty());
 }
 
 TEST_F(InvalidatorStorageTest, SetGetNotifierClientId) {
   InvalidatorStorage storage(&pref_service_);
   const std::string client_id("fK6eDzAIuKqx9A4+93bljg==");
 
-  storage.SetInvalidatorClientId(client_id);
+  storage.ClearAndSetNewClientId(client_id);
   EXPECT_EQ(client_id, storage.GetInvalidatorClientId());
 }
 
 TEST_F(InvalidatorStorageTest, SetGetBootstrapData) {
   InvalidatorStorage storage(&pref_service_);
   const std::string mess("n\0tK\0\0l\344", 8);
   ASSERT_FALSE(IsStringUTF8(mess));
 
   storage.SetBootstrapData(mess);
   EXPECT_EQ(mess, storage.GetBootstrapData());
@@ skipping 33 matching lines @@
   map.insert(std::make_pair(storage2.object_id(), storage2));
 
   storage.SetSavedInvalidations(map);
   syncer::UnackedInvalidationsMap restored_map =
       storage.GetSavedInvalidations();
 
   EXPECT_THAT(map, syncer::test_util::Eq(restored_map));
 }
 
 }  // namespace invalidation