| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 | 4 |
| 5 // Keep this file in sync with the .proto files in this directory. | 5 // Keep this file in sync with the .proto files in this directory. |
| 6 | 6 |
| 7 #ifndef SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ | 7 #ifndef SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ |
| 8 #define SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ | 8 #define SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include <memory> |
| 11 |
| 11 #include "sync/base/sync_export.h" | 12 #include "sync/base/sync_export.h" |
| 12 | 13 |
| 13 namespace base { | 14 namespace base { |
| 14 class DictionaryValue; | 15 class DictionaryValue; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace sync_pb { | 18 namespace sync_pb { |
| 18 class AppListSpecifics; | 19 class AppListSpecifics; |
| 19 class AppNotification; | 20 class AppNotification; |
| 20 class AppNotificationSettings; | 21 class AppNotificationSettings; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 // TODO(akalin): Add has_* information. | 89 // TODO(akalin): Add has_* information. |
| 89 // | 90 // |
| 90 // TODO(akalin): Improve enum support. | 91 // TODO(akalin): Improve enum support. |
| 91 | 92 |
| 92 namespace syncer { | 93 namespace syncer { |
| 93 | 94 |
| 94 // Ownership of all returned DictionaryValues are transferred to the | 95 // Ownership of all returned DictionaryValues are transferred to the |
| 95 // caller. | 96 // caller. |
| 96 | 97 |
| 97 // TODO(akalin): Perhaps extend this to decrypt? | 98 // TODO(akalin): Perhaps extend this to decrypt? |
| 98 SYNC_EXPORT scoped_ptr<base::DictionaryValue> EncryptedDataToValue( | 99 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> EncryptedDataToValue( |
| 99 const sync_pb::EncryptedData& encrypted_data); | 100 const sync_pb::EncryptedData& encrypted_data); |
| 100 | 101 |
| 101 // Sub-protocol of AppListSpecifics. | 102 // Sub-protocol of AppListSpecifics. |
| 102 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppListSpecificsToValue( | 103 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AppListSpecificsToValue( |
| 103 const sync_pb::AppListSpecifics& proto); | 104 const sync_pb::AppListSpecifics& proto); |
| 104 | 105 |
| 105 // Sub-protocols of AppSpecifics. | 106 // Sub-protocols of AppSpecifics. |
| 106 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSettingsToValue( | 107 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AppSettingsToValue( |
| 107 const sync_pb::AppNotificationSettings& app_notification_settings); | 108 const sync_pb::AppNotificationSettings& app_notification_settings); |
| 108 | 109 |
| 109 SYNC_EXPORT scoped_ptr<base::DictionaryValue> LinkedAppIconInfoToValue( | 110 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> LinkedAppIconInfoToValue( |
| 110 const sync_pb::LinkedAppIconInfo& linked_app_icon_info); | 111 const sync_pb::LinkedAppIconInfo& linked_app_icon_info); |
| 111 | 112 |
| 112 // Sub-protocols of SessionSpecifics. | 113 // Sub-protocols of SessionSpecifics. |
| 113 | 114 |
| 114 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionHeaderToValue( | 115 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SessionHeaderToValue( |
| 115 const sync_pb::SessionHeader& session_header); | 116 const sync_pb::SessionHeader& session_header); |
| 116 | 117 |
| 117 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionTabToValue( | 118 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SessionTabToValue( |
| 118 const sync_pb::SessionTab& session_tab); | 119 const sync_pb::SessionTab& session_tab); |
| 119 | 120 |
| 120 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionWindowToValue( | 121 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SessionWindowToValue( |
| 121 const sync_pb::SessionWindow& session_window); | 122 const sync_pb::SessionWindow& session_window); |
| 122 | 123 |
| 123 SYNC_EXPORT scoped_ptr<base::DictionaryValue> TabNavigationToValue( | 124 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> TabNavigationToValue( |
| 124 const sync_pb::TabNavigation& tab_navigation); | 125 const sync_pb::TabNavigation& tab_navigation); |
| 125 | 126 |
| 126 SYNC_EXPORT scoped_ptr<base::DictionaryValue> NavigationRedirectToValue( | 127 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> NavigationRedirectToValue( |
| 127 const sync_pb::NavigationRedirect& navigation_redirect); | 128 const sync_pb::NavigationRedirect& navigation_redirect); |
| 128 | 129 |
| 129 // Sub-protocol of PasswordSpecifics. | 130 // Sub-protocol of PasswordSpecifics. |
| 130 | 131 |
| 131 SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsDataToValue( | 132 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> PasswordSpecificsDataToValue( |
| 132 const sync_pb::PasswordSpecificsData& password_specifics_data); | 133 const sync_pb::PasswordSpecificsData& password_specifics_data); |
| 133 | 134 |
| 134 // Sub-protocol of NigoriSpecifics. | 135 // Sub-protocol of NigoriSpecifics. |
| 135 | 136 |
| 136 scoped_ptr<base::DictionaryValue> DeviceInformationToValue( | 137 std::unique_ptr<base::DictionaryValue> DeviceInformationToValue( |
| 137 const sync_pb::DeviceInformation& device_information); | 138 const sync_pb::DeviceInformation& device_information); |
| 138 | 139 |
| 139 // Sub-protocol of HistoryDeleteDirectiveSpecifics. | 140 // Sub-protocol of HistoryDeleteDirectiveSpecifics. |
| 140 | 141 |
| 141 scoped_ptr<base::DictionaryValue> GlobalIdDirectiveToValue( | 142 std::unique_ptr<base::DictionaryValue> GlobalIdDirectiveToValue( |
| 142 const sync_pb::GlobalIdDirective& global_id_directive); | 143 const sync_pb::GlobalIdDirective& global_id_directive); |
| 143 | 144 |
| 144 scoped_ptr<base::DictionaryValue> TimeRangeDirectiveToValue( | 145 std::unique_ptr<base::DictionaryValue> TimeRangeDirectiveToValue( |
| 145 const sync_pb::TimeRangeDirective& time_range_directive); | 146 const sync_pb::TimeRangeDirective& time_range_directive); |
| 146 | 147 |
| 147 // Sub-protocol of Experiments. | 148 // Sub-protocol of Experiments. |
| 148 | 149 |
| 149 scoped_ptr<base::DictionaryValue> KeystoreEncryptionToValue( | 150 std::unique_ptr<base::DictionaryValue> KeystoreEncryptionToValue( |
| 150 const sync_pb::KeystoreEncryptionFlagsSpecifics& proto); | 151 const sync_pb::KeystoreEncryptionFlagsSpecifics& proto); |
| 151 | 152 |
| 152 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionSpecificsToValue( | 153 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SessionSpecificsToValue( |
| 153 const sync_pb::SessionSpecifics& session_specifics); | 154 const sync_pb::SessionSpecifics& session_specifics); |
| 154 | 155 |
| 155 // Main *SpecificsToValue functions. | 156 // Main *SpecificsToValue functions. |
| 156 | 157 |
| 157 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppNotificationToValue( | 158 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AppNotificationToValue( |
| 158 const sync_pb::AppNotification& app_notification_specifics); | 159 const sync_pb::AppNotification& app_notification_specifics); |
| 159 | 160 |
| 160 scoped_ptr<base::DictionaryValue> AppSettingSpecificsToValue( | 161 std::unique_ptr<base::DictionaryValue> AppSettingSpecificsToValue( |
| 161 const sync_pb::AppSettingSpecifics& app_setting_specifics); | 162 const sync_pb::AppSettingSpecifics& app_setting_specifics); |
| 162 | 163 |
| 163 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSpecificsToValue( | 164 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AppSpecificsToValue( |
| 164 const sync_pb::AppSpecifics& app_specifics); | 165 const sync_pb::AppSpecifics& app_specifics); |
| 165 | 166 |
| 166 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ArticleSpecificsToValue( | 167 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ArticleSpecificsToValue( |
| 167 const sync_pb::ArticleSpecifics& article_specifics); | 168 const sync_pb::ArticleSpecifics& article_specifics); |
| 168 | 169 |
| 169 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillSpecificsToValue( | 170 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AutofillSpecificsToValue( |
| 170 const sync_pb::AutofillSpecifics& autofill_specifics); | 171 const sync_pb::AutofillSpecifics& autofill_specifics); |
| 171 | 172 |
| 172 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillProfileSpecificsToValue( | 173 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 174 AutofillProfileSpecificsToValue( |
| 173 const sync_pb::AutofillProfileSpecifics& autofill_profile_specifics); | 175 const sync_pb::AutofillProfileSpecifics& autofill_profile_specifics); |
| 174 | 176 |
| 175 SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMetadataSpecificsToValue( | 177 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 178 WalletMetadataSpecificsToValue( |
| 176 const sync_pb::WalletMetadataSpecifics& wallet_metadata_specifics); | 179 const sync_pb::WalletMetadataSpecifics& wallet_metadata_specifics); |
| 177 | 180 |
| 178 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillWalletSpecificsToValue( | 181 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 182 AutofillWalletSpecificsToValue( |
| 179 const sync_pb::AutofillWalletSpecifics& autofill_wallet_specifics); | 183 const sync_pb::AutofillWalletSpecifics& autofill_wallet_specifics); |
| 180 | 184 |
| 181 SYNC_EXPORT scoped_ptr<base::DictionaryValue> BookmarkSpecificsToValue( | 185 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> BookmarkSpecificsToValue( |
| 182 const sync_pb::BookmarkSpecifics& bookmark_specifics); | 186 const sync_pb::BookmarkSpecifics& bookmark_specifics); |
| 183 | 187 |
| 184 SYNC_EXPORT scoped_ptr<base::DictionaryValue> DeviceInfoSpecificsToValue( | 188 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> DeviceInfoSpecificsToValue( |
| 185 const sync_pb::DeviceInfoSpecifics& device_info_specifics); | 189 const sync_pb::DeviceInfoSpecifics& device_info_specifics); |
| 186 | 190 |
| 187 SYNC_EXPORT scoped_ptr<base::DictionaryValue> DictionarySpecificsToValue( | 191 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> DictionarySpecificsToValue( |
| 188 const sync_pb::DictionarySpecifics& dictionary_specifics); | 192 const sync_pb::DictionarySpecifics& dictionary_specifics); |
| 189 | 193 |
| 190 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExperimentsSpecificsToValue( | 194 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ExperimentsSpecificsToValue( |
| 191 const sync_pb::ExperimentsSpecifics& proto); | 195 const sync_pb::ExperimentsSpecifics& proto); |
| 192 | 196 |
| 193 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 197 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 194 PriorityPreferenceSpecificsToValue( | 198 PriorityPreferenceSpecificsToValue( |
| 195 const sync_pb::PriorityPreferenceSpecifics& proto); | 199 const sync_pb::PriorityPreferenceSpecifics& proto); |
| 196 | 200 |
| 197 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSettingSpecificsToValue( | 201 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 202 ExtensionSettingSpecificsToValue( |
| 198 const sync_pb::ExtensionSettingSpecifics& extension_setting_specifics); | 203 const sync_pb::ExtensionSettingSpecifics& extension_setting_specifics); |
| 199 | 204 |
| 200 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue( | 205 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ExtensionSpecificsToValue( |
| 201 const sync_pb::ExtensionSpecifics& extension_specifics); | 206 const sync_pb::ExtensionSpecifics& extension_specifics); |
| 202 | 207 |
| 203 SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconImageSpecificsToValue( | 208 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> FaviconImageSpecificsToValue( |
| 204 const sync_pb::FaviconImageSpecifics& favicon_image_specifics); | 209 const sync_pb::FaviconImageSpecifics& favicon_image_specifics); |
| 205 | 210 |
| 206 SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconTrackingSpecificsToValue( | 211 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 212 FaviconTrackingSpecificsToValue( |
| 207 const sync_pb::FaviconTrackingSpecifics& favicon_tracking_specifics); | 213 const sync_pb::FaviconTrackingSpecifics& favicon_tracking_specifics); |
| 208 | 214 |
| 209 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 215 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 210 HistoryDeleteDirectiveSpecificsToValue( | 216 HistoryDeleteDirectiveSpecificsToValue( |
| 211 const sync_pb::HistoryDeleteDirectiveSpecifics& | 217 const sync_pb::HistoryDeleteDirectiveSpecifics& |
| 212 history_delete_directive_specifics); | 218 history_delete_directive_specifics); |
| 213 | 219 |
| 214 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 220 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 215 ManagedUserSettingSpecificsToValue( | 221 ManagedUserSettingSpecificsToValue( |
| 216 const sync_pb::ManagedUserSettingSpecifics& managed_user_setting_specifics); | 222 const sync_pb::ManagedUserSettingSpecifics& managed_user_setting_specifics); |
| 217 | 223 |
| 218 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ManagedUserSpecificsToValue( | 224 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ManagedUserSpecificsToValue( |
| 219 const sync_pb::ManagedUserSpecifics& managed_user_specifics); | 225 const sync_pb::ManagedUserSpecifics& managed_user_specifics); |
| 220 | 226 |
| 221 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 227 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 222 ManagedUserSharedSettingSpecificsToValue( | 228 ManagedUserSharedSettingSpecificsToValue( |
| 223 const sync_pb::ManagedUserSharedSettingSpecifics& | 229 const sync_pb::ManagedUserSharedSettingSpecifics& |
| 224 managed_user_shared_setting_specifics); | 230 managed_user_shared_setting_specifics); |
| 225 | 231 |
| 226 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 232 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 227 ManagedUserWhitelistSpecificsToValue( | 233 ManagedUserWhitelistSpecificsToValue( |
| 228 const sync_pb::ManagedUserWhitelistSpecifics& | 234 const sync_pb::ManagedUserWhitelistSpecifics& |
| 229 managed_user_whitelist_specifics); | 235 managed_user_whitelist_specifics); |
| 230 | 236 |
| 231 SYNC_EXPORT scoped_ptr<base::DictionaryValue> MediaToValue( | 237 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> MediaToValue( |
| 232 const sync_pb::Media& media); | 238 const sync_pb::Media& media); |
| 233 | 239 |
| 234 SYNC_EXPORT scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue( | 240 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> NigoriSpecificsToValue( |
| 235 const sync_pb::NigoriSpecifics& nigori_specifics); | 241 const sync_pb::NigoriSpecifics& nigori_specifics); |
| 236 | 242 |
| 237 SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsToValue( | 243 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> PasswordSpecificsToValue( |
| 238 const sync_pb::PasswordSpecifics& password_specifics); | 244 const sync_pb::PasswordSpecifics& password_specifics); |
| 239 | 245 |
| 240 SYNC_EXPORT scoped_ptr<base::DictionaryValue> PreferenceSpecificsToValue( | 246 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> PreferenceSpecificsToValue( |
| 241 const sync_pb::PreferenceSpecifics& password_specifics); | 247 const sync_pb::PreferenceSpecifics& password_specifics); |
| 242 | 248 |
| 243 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 249 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 244 SyncedNotificationAppInfoSpecificsToValue( | 250 SyncedNotificationAppInfoSpecificsToValue( |
| 245 const sync_pb::SyncedNotificationAppInfoSpecifics& | 251 const sync_pb::SyncedNotificationAppInfoSpecifics& |
| 246 synced_notification_specifics); | 252 synced_notification_specifics); |
| 247 | 253 |
| 248 SYNC_EXPORT scoped_ptr<base::DictionaryValue> | 254 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 249 SyncedNotificationSpecificsToValue( | 255 SyncedNotificationSpecificsToValue( |
| 250 const sync_pb::SyncedNotificationSpecifics& synced_notification_specifics); | 256 const sync_pb::SyncedNotificationSpecifics& synced_notification_specifics); |
| 251 | 257 |
| 252 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SearchEngineSpecificsToValue( | 258 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SearchEngineSpecificsToValue( |
| 253 const sync_pb::SearchEngineSpecifics& search_engine_specifics); | 259 const sync_pb::SearchEngineSpecifics& search_engine_specifics); |
| 254 | 260 |
| 255 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ThemeSpecificsToValue( | 261 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ThemeSpecificsToValue( |
| 256 const sync_pb::ThemeSpecifics& theme_specifics); | 262 const sync_pb::ThemeSpecifics& theme_specifics); |
| 257 | 263 |
| 258 SYNC_EXPORT scoped_ptr<base::DictionaryValue> TypedUrlSpecificsToValue( | 264 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> TypedUrlSpecificsToValue( |
| 259 const sync_pb::TypedUrlSpecifics& typed_url_specifics); | 265 const sync_pb::TypedUrlSpecifics& typed_url_specifics); |
| 260 | 266 |
| 261 SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMaskedCreditCardToValue( | 267 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 268 WalletMaskedCreditCardToValue( |
| 262 const sync_pb::WalletMaskedCreditCard& wallet_masked_card); | 269 const sync_pb::WalletMaskedCreditCard& wallet_masked_card); |
| 263 | 270 |
| 264 SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletPostalAddressToValue( | 271 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> WalletPostalAddressToValue( |
| 265 const sync_pb::WalletPostalAddress& wallet_postal_address); | 272 const sync_pb::WalletPostalAddress& wallet_postal_address); |
| 266 | 273 |
| 267 SYNC_EXPORT scoped_ptr<base::DictionaryValue> WifiCredentialSpecificsToValue( | 274 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 275 WifiCredentialSpecificsToValue( |
| 268 const sync_pb::WifiCredentialSpecifics& wifi_credential_specifics); | 276 const sync_pb::WifiCredentialSpecifics& wifi_credential_specifics); |
| 269 | 277 |
| 270 // Any present extensions are mapped to sub-dictionary values with the | 278 // Any present extensions are mapped to sub-dictionary values with the |
| 271 // key equal to the extension name. | 279 // key equal to the extension name. |
| 272 SYNC_EXPORT scoped_ptr<base::DictionaryValue> EntitySpecificsToValue( | 280 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> EntitySpecificsToValue( |
| 273 const sync_pb::EntitySpecifics& specifics); | 281 const sync_pb::EntitySpecifics& specifics); |
| 274 | 282 |
| 275 SYNC_EXPORT scoped_ptr<base::DictionaryValue> SyncEntityToValue( | 283 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> SyncEntityToValue( |
| 276 const sync_pb::SyncEntity& entity, | 284 const sync_pb::SyncEntity& entity, |
| 277 bool include_specifics); | 285 bool include_specifics); |
| 278 | 286 |
| 279 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerMessageToValue( | 287 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ClientToServerMessageToValue( |
| 280 const sync_pb::ClientToServerMessage& proto, | 288 const sync_pb::ClientToServerMessage& proto, |
| 281 bool include_specifics); | 289 bool include_specifics); |
| 282 | 290 |
| 283 SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerResponseToValue( | 291 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> |
| 284 const sync_pb::ClientToServerResponse& proto, | 292 ClientToServerResponseToValue(const sync_pb::ClientToServerResponse& proto, |
| 285 bool include_specifics); | 293 bool include_specifics); |
| 286 | 294 |
| 287 scoped_ptr<base::DictionaryValue> DatatypeAssociationStatsToValue( | 295 std::unique_ptr<base::DictionaryValue> DatatypeAssociationStatsToValue( |
| 288 const sync_pb::DatatypeAssociationStats& proto); | 296 const sync_pb::DatatypeAssociationStats& proto); |
| 289 | 297 |
| 290 scoped_ptr<base::DictionaryValue> DebugEventInfoToValue( | 298 std::unique_ptr<base::DictionaryValue> DebugEventInfoToValue( |
| 291 const sync_pb::DebugEventInfo& proto); | 299 const sync_pb::DebugEventInfo& proto); |
| 292 | 300 |
| 293 scoped_ptr<base::DictionaryValue> DebugInfoToValue( | 301 std::unique_ptr<base::DictionaryValue> DebugInfoToValue( |
| 294 const sync_pb::DebugInfo& proto); | 302 const sync_pb::DebugInfo& proto); |
| 295 | 303 |
| 296 scoped_ptr<base::DictionaryValue> SyncCycleCompletedEventInfoToValue( | 304 std::unique_ptr<base::DictionaryValue> SyncCycleCompletedEventInfoToValue( |
| 297 const sync_pb::SyncCycleCompletedEventInfo& proto); | 305 const sync_pb::SyncCycleCompletedEventInfo& proto); |
| 298 | 306 |
| 299 scoped_ptr<base::DictionaryValue> ClientConfigParamsToValue( | 307 std::unique_ptr<base::DictionaryValue> ClientConfigParamsToValue( |
| 300 const sync_pb::ClientConfigParams& proto); | 308 const sync_pb::ClientConfigParams& proto); |
| 301 | 309 |
| 302 SYNC_EXPORT scoped_ptr<base::DictionaryValue> AttachmentIdProtoToValue( | 310 SYNC_EXPORT std::unique_ptr<base::DictionaryValue> AttachmentIdProtoToValue( |
| 303 const sync_pb::AttachmentIdProto& proto); | 311 const sync_pb::AttachmentIdProto& proto); |
| 304 | 312 |
| 305 } // namespace syncer | 313 } // namespace syncer |
| 306 | 314 |
| 307 #endif // SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ | 315 #endif // SYNC_PROTOCOL_PROTO_VALUE_CONVERSIONS_H_ |
| OLD | NEW |