| Index: chrome/browser/sync/profile_sync_service.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
|
| index 61ad4f310473e5db1bdeb9539e9d4febdfee8d8b..60a247b0e4ebb8583feccc8494f6a45957bb053f 100644
|
| --- a/chrome/browser/sync/profile_sync_service.cc
|
| +++ b/chrome/browser/sync/profile_sync_service.cc
|
| @@ -123,10 +123,10 @@ using syncer::WeakHandle;
|
|
|
| typedef GoogleServiceAuthError AuthError;
|
|
|
| -const char* ProfileSyncService::kSyncServerUrl =
|
| +const char ProfileSyncService::kSyncServerUrl[] =
|
| "https://clients4.google.com/chrome-sync";
|
|
|
| -const char* ProfileSyncService::kDevServerUrl =
|
| +const char ProfileSyncService::kDevServerUrl[] =
|
| "https://clients4.google.com/chrome-sync/dev";
|
|
|
| const char kSyncUnrecoverableErrorHistogram[] =
|
| @@ -930,7 +930,6 @@ void ProfileSyncService::ClearStaleErrors() {
|
| // Clear the data type errors as well.
|
| if (directory_data_type_manager_.get())
|
| directory_data_type_manager_->ResetDataTypeErrors();
|
| -
|
| }
|
|
|
| void ProfileSyncService::ClearUnrecoverableError() {
|
| @@ -2030,7 +2029,7 @@ base::Value* ProfileSyncService::GetTypeStatusMap() const {
|
| }
|
|
|
| SyncBackendHost::Status detailed_status = backend_->GetDetailedStatus();
|
| - ModelTypeSet &throttled_types(detailed_status.throttled_types);
|
| + ModelTypeSet& throttled_types(detailed_status.throttled_types);
|
| ModelTypeSet registered = GetRegisteredDataTypes();
|
| scoped_ptr<base::DictionaryValue> type_status_header(
|
| new base::DictionaryValue());
|
|
|