Use base::StringPairs where appropriate from /chrome

chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc

Index: chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
index 9748f24840c10748da8a57a38dab449f9b18c457..89e5e978d05d64149ab3fa091377c5ee0d424592 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
+++ b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
+#include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/interceptable_pref_filter.h"
 #include "chrome/browser/prefs/pref_hash_store.h"
@@ -219,8 +220,7 @@ class TrackedPreferencesMigrationTest : public testing::Test {
   // in the store identified by |store_id|.
   void VerifyValuesStored(
       MockPrefStoreID store_id,
-      const std::vector<std::pair<std::string, std::string> >&
-          expected_prefs_in_store) {
+      const base::StringPairs& expected_prefs_in_store) {
     base::DictionaryValue* store = NULL;
     switch (store_id) {
       case MOCK_UNPROTECTED_PREF_STORE:
@@ -232,8 +232,7 @@ class TrackedPreferencesMigrationTest : public testing::Test {
     }
     DCHECK(store);
 
-    for (std::vector<std::pair<std::string, std::string> >::const_iterator it =
-             expected_prefs_in_store.begin();
+    for (base::StringPairs::const_iterator it = expected_prefs_in_store.begin();
          it != expected_prefs_in_store.end(); ++it) {
       std::string val;
       EXPECT_TRUE(store->GetString(it->first, &val));
@@ -474,12 +473,12 @@ TEST_F(TrackedPreferencesMigrationTest, NoMigrationRequired) {
   EXPECT_FALSE(StoreModifiedByMigration(MOCK_UNPROTECTED_PREF_STORE));
   EXPECT_FALSE(StoreModifiedByMigration(MOCK_PROTECTED_PREF_STORE));
 
-  std::vector<std::pair<std::string, std::string> > expected_unprotected_values;
+  base::StringPairs expected_unprotected_values;
   expected_unprotected_values.push_back(
       std::make_pair(kUnprotectedPref, kUnprotectedPrefValue));
   VerifyValuesStored(MOCK_UNPROTECTED_PREF_STORE, expected_unprotected_values);
 
-  std::vector<std::pair<std::string, std::string> > expected_protected_values;
+  base::StringPairs expected_protected_values;
   expected_protected_values.push_back(
       std::make_pair(kProtectedPref, kProtectedPrefValue));
   VerifyValuesStored(MOCK_PROTECTED_PREF_STORE, expected_protected_values);