Remove canary member from SyncSessionJob

sync/engine/sync_scheduler_whitebox_unittest.cc

Index: sync/engine/sync_scheduler_whitebox_unittest.cc
diff --git a/sync/engine/sync_scheduler_whitebox_unittest.cc b/sync/engine/sync_scheduler_whitebox_unittest.cc
index 383f17d01fd541ab1002d96b007436282fa9321f..29502ba07ea925fc7cb82691c2ef23784dbf83f5 100644
--- a/sync/engine/sync_scheduler_whitebox_unittest.cc
+++ b/sync/engine/sync_scheduler_whitebox_unittest.cc
@@ -92,8 +92,9 @@ class SyncSchedulerWhiteboxTest : public testing::Test {
   }
 
   SyncSchedulerImpl::JobProcessDecision DecideOnJob(
-      const SyncSessionJob& job) {
-    return scheduler_->DecideOnJob(job);
+      const SyncSessionJob& job,
+      bool is_canary) {
+    return scheduler_->DecideOnJob(job, is_canary);
   }
 
   void InitializeSyncerOnNormalMode() {
@@ -106,7 +107,7 @@ class SyncSchedulerWhiteboxTest : public testing::Test {
     scoped_ptr<SyncSession> s(scheduler_->CreateSyncSession(SyncSourceInfo()));
     SyncSessionJob job(purpose, TimeTicks::Now(), s.Pass(),
         ConfigurationParams(), FROM_HERE);
-    return DecideOnJob(job);
+    return DecideOnJob(job, false);
   }
 
   SyncSessionContext* context() { return context_.get(); }
@@ -158,7 +159,7 @@ TEST_F(SyncSchedulerWhiteboxTest, SaveNudgeWhileTypeThrottled) {
                      s.Pass(),
                      ConfigurationParams(),
                      FROM_HERE);
-  SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
+  SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job, false);
   EXPECT_EQ(decision, SyncSchedulerImpl::SAVE);
 }
 
@@ -256,8 +257,7 @@ TEST_F(SyncSchedulerWhiteboxTest, ContinueCanaryJobConfig) {
                      TimeTicks::Now(), scoped_ptr<SyncSession>(),
                      ConfigurationParams(), FROM_HERE);
 
-  job.GrantCanaryPrivilege();
-  SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
+  SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job, true);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }