| Index: chrome/browser/sync/profile_sync_service.h
|
| diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
|
| index 1cdd6620ab2bf2f7038a7fc503f0022f36c31966..1f45e1fa014020e6688d6e8a5d6b058470813b90 100644
|
| --- a/chrome/browser/sync/profile_sync_service.h
|
| +++ b/chrome/browser/sync/profile_sync_service.h
|
| @@ -293,8 +293,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
|
| return unrecoverable_error_message_;
|
| }
|
| tracked_objects::Location unrecoverable_error_location() {
|
| - return unrecoverable_error_location_.get() ?
|
| - *unrecoverable_error_location_.get() : tracked_objects::Location();
|
| + return unrecoverable_error_location_;
|
| }
|
|
|
| bool UIShouldDepictAuthInProgress() const {
|
| @@ -613,7 +612,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
|
|
|
| // A message sent when an unrecoverable error occurred.
|
| std::string unrecoverable_error_message_;
|
| - scoped_ptr<tracked_objects::Location> unrecoverable_error_location_;
|
| + tracked_objects::Location unrecoverable_error_location_;
|
|
|
| // Manages the start and stop of the various data types.
|
| scoped_ptr<browser_sync::DataTypeManager> data_type_manager_;
|
|
|