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

Side by Side Diff: chrome/browser/sync/glue/autofill_profile_syncable_service.h

Issue 7912002: Fix for Crash in AutofillProfileSyncableService::ActOnChange (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync/glue/autofill_profile_syncable_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 4 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
5 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 5 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
6 #pragma once 6 #pragma once
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 virtual bool SaveChangesToWebData(const DataBundle& bundle); 88 virtual bool SaveChangesToWebData(const DataBundle& bundle);
89 89
90 private: 90 private:
91 friend class ::ProfileSyncServiceAutofillTest; 91 friend class ::ProfileSyncServiceAutofillTest;
92 friend class MockAutofillProfileSyncableService; 92 friend class MockAutofillProfileSyncableService;
93 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, 93 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
94 MergeDataAndStartSyncing); 94 MergeDataAndStartSyncing);
95 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, GetAllSyncData); 95 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, GetAllSyncData);
96 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, 96 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
97 ProcessSyncChanges); 97 ProcessSyncChanges);
98 FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
99 ActOnChange);
98 100
99 // The map of the guid to profiles owned by the |profiles_| vector. 101 // The map of the guid to profiles owned by the |profiles_| vector.
100 typedef std::map<std::string, AutofillProfile*> GUIDToProfileMap; 102 typedef std::map<std::string, AutofillProfile*> GUIDToProfileMap;
101 103
102 // Helper function that overwrites |profile| with data from proto-buffer 104 // Helper function that overwrites |profile| with data from proto-buffer
103 // |specifics|. 105 // |specifics|.
104 static bool OverwriteProfileWithServerData( 106 static bool OverwriteProfileWithServerData(
105 const sync_pb::AutofillProfileSpecifics& specifics, 107 const sync_pb::AutofillProfileSpecifics& specifics,
106 AutofillProfile* profile); 108 AutofillProfile* profile);
107 109
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 157
156 std::vector<std::string> profiles_to_delete; 158 std::vector<std::string> profiles_to_delete;
157 std::vector<AutofillProfile*> profiles_to_update; 159 std::vector<AutofillProfile*> profiles_to_update;
158 std::vector<AutofillProfile*> profiles_to_add; 160 std::vector<AutofillProfile*> profiles_to_add;
159 }; 161 };
160 162
161 } // namespace browser_sync 163 } // namespace browser_sync
162 164
163 #endif // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 165 #endif // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
164 166
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/glue/autofill_profile_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698