Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(677)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc

Issue 599463002: Use base::StringPairs where appropriate from src/chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc ('K') | « chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc ('k') | chrome/browser/profile_resetter/resettable_settings_snapshot.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 89e5e978d05d64149ab3fa091377c5ee0d424592..3bfa2d98902b088dc1c984f6e549ef340c90cedd 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
+++ b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
@@ -531,12 +531,12 @@ TEST_F(TrackedPreferencesMigrationTest, LegacyHashMigrationOnly) {
EXPECT_TRUE(StoreModifiedByMigration(MOCK_UNPROTECTED_PREF_STORE));
EXPECT_TRUE(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);
@@ -612,12 +612,12 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigrationWithLegacyHashStore) {
// All values should have been moved to their preferred locations, including
// MACs.
- 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));
expected_unprotected_values.push_back(
std::make_pair(kPreviouslyProtectedPref, kPreviouslyProtectedPrefValue));
- 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));
expected_protected_values.push_back(std::make_pair(
@@ -738,8 +738,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
// Values should have been migrated to their store, but migrated values should
// still remain in the source store until cleanup tasks are later invoked.
{
- std::vector<std::pair<std::string, std::string> >
- expected_unprotected_values;
+ base::StringPairs expected_unprotected_values;
Lei Zhang 2014/09/23 17:22:41 nit: extra space
Anand Ratn (left samsung) 2014/09/24 03:50:53 Done.
expected_unprotected_values.push_back(std::make_pair(
kUnprotectedPref, kUnprotectedPrefValue));
expected_unprotected_values.push_back(std::make_pair(
@@ -749,7 +748,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
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));
expected_protected_values.push_back(std::make_pair(
@@ -778,8 +777,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
SimulateSuccessfulWrite(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));
expected_unprotected_values.push_back(std::make_pair(
@@ -787,7 +785,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
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));
expected_protected_values.push_back(std::make_pair(
@@ -800,8 +798,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
SimulateSuccessfulWrite(MOCK_UNPROTECTED_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));
expected_unprotected_values.push_back(std::make_pair(
@@ -809,7 +806,7 @@ TEST_F(TrackedPreferencesMigrationTest, FullMigration) {
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));
expected_protected_values.push_back(std::make_pair(
@@ -893,8 +890,7 @@ TEST_F(TrackedPreferencesMigrationTest, CleanupOnly) {
// Cleanup should happen synchronously if the values were already present in
// their destination stores.
{
- 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));
expected_unprotected_values.push_back(std::make_pair(
@@ -902,7 +898,7 @@ TEST_F(TrackedPreferencesMigrationTest, CleanupOnly) {
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));
expected_protected_values.push_back(std::make_pair(
« chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc ('K') | « chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc ('k') | chrome/browser/profile_resetter/resettable_settings_snapshot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698