| 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 0af7081470d24f4fc938ef66497ecb372cc6fb5c..32665d92c08602ad17acf797f96c2b3ca97e932d 100644
|
| --- a/chrome/browser/sync/profile_sync_service.h
|
| +++ b/chrome/browser/sync/profile_sync_service.h
|
| @@ -286,8 +286,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 {
|
| @@ -608,7 +607,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_;
|
|
|