Commit InvalidationService implementations

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/sync/invalidations/invalidator_storage.h"
+#include "chrome/browser/invalidation/invalidator_storage.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncer::InvalidationStateMap;
 
-namespace browser_sync {
-
 namespace {
 
 const char kSourceKey[] = "source";
 const char kNameKey[] = "name";
 const char kMaxVersionKey[] = "max-version";
 const char kPayloadKey[] = "payload";
 const char kCurrentAckHandleKey[] = "current-ack";
 const char kExpectedAckHandleKey[] = "expected-ack";
 
 const int kChromeSyncSourceId = 1004;
 
 void GenerateAckHandlesTestHelper(syncer::AckHandleMap* output,
                                   const syncer::AckHandleMap& input) {
   *output = input;
 }
 
 }  // namespace
 
+namespace invalidation {
+
 class InvalidatorStorageTest : public testing::Test {
  public:
   InvalidatorStorageTest()
       : kBookmarksId_(kChromeSyncSourceId, "BOOKMARK"),
         kPreferencesId_(kChromeSyncSourceId, "PREFERENCE"),
         kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"),
         kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {}
 
   virtual void SetUp() {
     InvalidatorStorage::RegisterUserPrefs(pref_service_.registry());
@@ skipping 445 matching lines @@
   ASSERT_TRUE(ack_handle_map.end() != it);
   EXPECT_TRUE(it->second.IsValid());
   state_map[kBookmarksId_].expected = it->second;
   EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
 
   storage.Acknowledge(kBookmarksId_, it->second);
   state_map[kBookmarksId_].current = it->second;
   EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
 }
 
-}  // namespace browser_sync
+}  // namespace invalidation