Remove canary member from SyncSessionJob

sync/engine/sync_session_job_unittest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "sync/internal_api/public/base/model_type_invalidation_map.h"
@@ skipping 79 matching lines @@
   const ModelSafeRoutingInfo& routes() { return routes_; }
 
   // Checks that the two jobs are "clones" as defined by SyncSessionJob,
   // minus location and SyncSession checking, for reuse in different
   // scenarios.
   void ExpectClonesBase(SyncSessionJob* job, SyncSessionJob* clone) {
     EXPECT_EQ(job->purpose(), clone->purpose());
     EXPECT_EQ(job->scheduled_start(), clone->scheduled_start());
     EXPECT_EQ(job->start_step(), clone->start_step());
     EXPECT_EQ(job->end_step(), clone->end_step());
-    EXPECT_FALSE(clone->is_canary());
   }
 
  private:
   scoped_ptr<sessions::SyncSessionContext> context_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   MockDelegate delegate_;
   ModelSafeRoutingInfo routes_;
   bool config_params_callback_invoked_;
 };
 
 TEST_F(SyncSessionJobTest, Clone) {
   SyncSessionJob job1(SyncSessionJob::NUDGE, TimeTicks::Now(),
       NewLocalSession().Pass(), ConfigurationParams());
 
   sessions::test_util::SimulateSuccess(job1.mutable_session(),
                                        job1.start_step(),
                                        job1.end_step());
   job1.Finish(false);
   ModelSafeRoutingInfo new_routes;
   new_routes[AUTOFILL] = GROUP_PASSIVE;
   context()->set_routing_info(new_routes);
   scoped_ptr<SyncSessionJob> clone1 = job1.Clone();
 
   ExpectClonesBase(&job1, clone1.get());
   EXPECT_NE(job1.session(), clone1->session());
 
   context()->set_routing_info(routes());
-  clone1->GrantCanaryPrivilege();
   sessions::test_util::SimulateSuccess(clone1->mutable_session(),
                                        clone1->start_step(),
                                        clone1->end_step());
   clone1->Finish(false);
   scoped_ptr<SyncSessionJob> clone2 = clone1->Clone();
 
   ExpectClonesBase(clone1.get(), clone2.get());
   EXPECT_NE(clone1->session(), clone2->session());
   EXPECT_NE(clone1->session(), clone2->session());
 
@@ skipping 61 matching lines @@
   SyncSessionJob job1(SyncSessionJob::CONFIGURATION, TimeTicks::Now(),
       session.Pass(), params);
   sessions::test_util::SimulateSuccess(job1.mutable_session(),
                                        job1.start_step(),
                                        job1.end_step());
   job1.Finish(false);
   EXPECT_TRUE(config_params_callback_invoked());
 }
 
 }  // namespace syncer