Remove canary member from SyncSessionJob

sync/engine/sync_session_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/sync_session_job.h"
 #include "sync/internal_api/public/sessions/model_neutral_state.h"
 
 namespace syncer {
 
 SyncSessionJob::~SyncSessionJob() {
   if (destruction_observer_)
     destruction_observer_->OnJobDestroyed(this);
 }
 
 SyncSessionJob::SyncSessionJob(
     Purpose purpose,
     base::TimeTicks start,
     scoped_ptr<sessions::SyncSession> session,
     const ConfigurationParams& config_params,
     const tracked_objects::Location& from_location)
     : purpose_(purpose),
       scheduled_start_(start),
       session_(session.Pass()),
-      is_canary_(false),
       config_params_(config_params),
       finished_(NOT_FINISHED),
       from_location_(from_location) {
 }
 
 void SyncSessionJob::set_destruction_observer(
     const base::WeakPtr<DestructionObserver>& destruction_observer) {
   destruction_observer_ = destruction_observer;
 }
 
@@ skipping 72 matching lines @@
       purpose_, scheduled_start_, CloneSession().Pass(),
       config_params_, from_here));
 }
 
 scoped_ptr<sessions::SyncSession> SyncSessionJob::CloneSession() const {
   return scoped_ptr<sessions::SyncSession>(
       new sessions::SyncSession(session_->context(),
           session_->delegate(), session_->source()));
 }
 
-bool SyncSessionJob::is_canary() const {
-  return is_canary_;
-}
-
 SyncSessionJob::Purpose SyncSessionJob::purpose() const {
   return purpose_;
 }
 
 base::TimeTicks SyncSessionJob::scheduled_start() const {
   return scheduled_start_;
 }
 
 void SyncSessionJob::set_scheduled_start(base::TimeTicks start) {
   scheduled_start_ = start;
 };
 
 const sessions::SyncSession* SyncSessionJob::session() const {
   return session_.get();
 }
 
 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_;
 }
 
-void SyncSessionJob::GrantCanaryPrivilege() {
-  DCHECK_EQ(finished_, NOT_FINISHED);
-  DVLOG(2) << "Granting canary priviliege to " << session_.get();
-  is_canary_ = true;
-}
-
 SyncerStep SyncSessionJob::start_step() const {
   SyncerStep start, end;
   GetSyncerStepsForPurpose(purpose_, &start, &end);
   return start;
 }
 
 SyncerStep SyncSessionJob::end_step() const {
   SyncerStep start, end;
   GetSyncerStepsForPurpose(purpose_, &start, &end);
   return end;
@@ skipping 15 matching lines @@
       return;
     default:
       NOTREACHED();
       *start = SYNCER_END;
       *end = SYNCER_END;
       return;
   }
 }
 
 }  // namespace syncer