Refactor common invalidation framework types

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/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
@@ skipping 257 matching lines @@
   value->SetString(kMaxVersionKey, "20");
   value->SetString(kPayloadKey, "testing");
   value->Set(kCurrentAckHandleKey, ack_handle_1.ToValue().release());
   value->Set(kExpectedAckHandleKey, ack_handle_2.ToValue().release());
   list.Append(value);
 
   InvalidatorStorage::DeserializeFromList(list, &map);
   EXPECT_EQ(1U, map.size());
   EXPECT_EQ(20, map[kAppNotificationsId_].version);
   EXPECT_EQ("testing", map[kAppNotificationsId_].payload);
-  EXPECT_THAT(map[kAppNotificationsId_].current, Eq(ack_handle_1));
-  EXPECT_THAT(map[kAppNotificationsId_].expected, Eq(ack_handle_2));
+  EXPECT_THAT(map[kAppNotificationsId_].current, syncer::Eq(ack_handle_1));
+  EXPECT_THAT(map[kAppNotificationsId_].expected, syncer::Eq(ack_handle_2));
 }
 
 // Tests that deserializing well-formed values when optional parameters are
 // omitted works.
 TEST_F(InvalidatorStorageTest, DeserializeFromListMissingOptionalValues) {
   InvalidationStateMap map;
   base::ListValue list;
   DictionaryValue* value;
   syncer::AckHandle ack_handle = syncer::AckHandle::CreateUnique();
 
@@ skipping 207 matching lines @@
   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 invalidation