| Index: sync/engine/sync_session_job.cc
|
| diff --git a/sync/engine/sync_session_job.cc b/sync/engine/sync_session_job.cc
|
| index f980a5cd052d62ff89a8911ba2a3f866a2e9e773..adf898e26fc907898b7278cff32cf5d920519207 100644
|
| --- a/sync/engine/sync_session_job.cc
|
| +++ b/sync/engine/sync_session_job.cc
|
| @@ -16,15 +16,13 @@ SyncSessionJob::SyncSessionJob(
|
| Purpose purpose,
|
| base::TimeTicks start,
|
| scoped_ptr<sessions::SyncSession> session,
|
| - const ConfigurationParams& config_params,
|
| - const tracked_objects::Location& from_location)
|
| + const ConfigurationParams& config_params)
|
| : purpose_(purpose),
|
| scheduled_start_(start),
|
| session_(session.Pass()),
|
| is_canary_(false),
|
| config_params_(config_params),
|
| - finished_(NOT_FINISHED),
|
| - from_location_(from_location) {
|
| + finished_(NOT_FINISHED) {
|
| }
|
|
|
| void SyncSessionJob::set_destruction_observer(
|
| @@ -90,22 +88,14 @@ scoped_ptr<SyncSessionJob> SyncSessionJob::CloneAndAbandon() {
|
| // Clone |this|, and abandon it by NULL-ing session_.
|
| return scoped_ptr<SyncSessionJob> (new SyncSessionJob(
|
| purpose_, scheduled_start_, session_.Pass(),
|
| - config_params_, from_location_));
|
| + config_params_));
|
| }
|
|
|
| scoped_ptr<SyncSessionJob> SyncSessionJob::Clone() const {
|
| DCHECK_GT(finished_, NOT_FINISHED);
|
| return scoped_ptr<SyncSessionJob>(new SyncSessionJob(
|
| purpose_, scheduled_start_, CloneSession().Pass(),
|
| - config_params_, from_location_));
|
| -}
|
| -
|
| -scoped_ptr<SyncSessionJob> SyncSessionJob::CloneFromLocation(
|
| - const tracked_objects::Location& from_here) const {
|
| - DCHECK_GT(finished_, NOT_FINISHED);
|
| - return scoped_ptr<SyncSessionJob>(new SyncSessionJob(
|
| - purpose_, scheduled_start_, CloneSession().Pass(),
|
| - config_params_, from_here));
|
| + config_params_));
|
| }
|
|
|
| scoped_ptr<sessions::SyncSession> SyncSessionJob::CloneSession() const {
|
| @@ -138,10 +128,6 @@ sessions::SyncSession* SyncSessionJob::mutable_session() {
|
| return session_.get();
|
| }
|
|
|
| -const tracked_objects::Location& SyncSessionJob::from_location() const {
|
| - return from_location_;
|
| -}
|
| -
|
| ConfigurationParams SyncSessionJob::config_params() const {
|
| return config_params_;
|
| }
|
|
|