Index: chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
index 6f64059c701b0dd91a934dc5134cbadecba60db2..808a7440e602582a1bbb694017f1651fc745fa43 100644 |
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
@@ -112,7 +112,7 @@ class WebDatabaseMock : public WebDatabase { |
MOCK_METHOD1(AddAutoFillProfile, |
bool(const AutoFillProfile&)); // NOLINT |
MOCK_METHOD1(RemoveAutoFillProfile, |
- bool(const string&)); // NOLINT |
+ bool(const std::string&)); // NOLINT |
}; |
class ProfileSyncServiceAutofillTest; |
@@ -809,7 +809,7 @@ TEST_F(ProfileSyncServiceAutofillTest, MergeProfileWithDifferentGuid) { |
"johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA", |
"91601", "US", "12345678910", "01987654321"); |
- string native_guid = "{EDC609ED-7EEE-4f27-B00C-423242A9C44B}"; |
+ std::string native_guid = "{EDC609ED-7EEE-4f27-B00C-423242A9C44B}"; |
AutoFillProfile* native_profile = new AutoFillProfile; |
autofill_test::SetProfileInfoWithGuid(native_profile, |
native_guid.c_str(), "Billing", |