New authorization framework for sync. ...

chrome/browser/sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2009 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 "chrome/browser/sync/sessions/sync_session.h"
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncable::MultiTypeTimeStamp;
 using syncable::WriteTransaction;
 
 namespace browser_sync {
 namespace sessions {
 namespace {
 
 class SyncSessionTest : public testing::Test,
                         public SyncSession::Delegate,
                         public ModelSafeWorkerRegistrar {
  public:
   SyncSessionTest() : controller_invocations_allowed_(false) {
     GetModelSafeRoutingInfo(&routes_);
   }
   virtual void SetUp() {
-    context_.reset(new SyncSessionContext(NULL, NULL, NULL, this));
+    context_.reset(new SyncSessionContext(NULL, NULL, this));
     session_.reset(new SyncSession(context_.get(), this));
   }
   virtual void TearDown() {
     session_.reset();
     context_.reset();
   }
 
   virtual void OnSilencedUntil(const base::TimeTicks& silenced_until) {
     FailControllerInvocationIfDisabled("OnSilencedUntil");
   }
   virtual bool IsSyncingCurrentlySilenced() {
     FailControllerInvocationIfDisabled("IsSyncingCurrentlySilenced");
-   return false;
+    return false;
   }
   virtual void OnReceivedLongPollIntervalUpdate(
       const base::TimeDelta& new_interval) {
     FailControllerInvocationIfDisabled("OnReceivedLongPollIntervalUpdate");
   }
   virtual void OnReceivedShortPollIntervalUpdate(
       const base::TimeDelta& new_interval) {
     FailControllerInvocationIfDisabled("OnReceivedShortPollIntervalUpdate");
   }
   virtual void OnShouldStopSyncingPermanently() {
-      FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently");
+    FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently");
   }
 
   // ModelSafeWorkerRegistrar implementation.
   virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) {}
   virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) {
     (*out)[syncable::BOOKMARKS] = GROUP_UI;
     (*out)[syncable::AUTOFILL] = GROUP_UI;
   }
 
   StatusController* status() { return session_->status_controller(); }
@@ skipping 38 matching lines @@
   EXPECT_FALSE(context_->resolver());
   EXPECT_FALSE(context_->syncer_event_channel());
   channel->Notify(SyncerEvent(SyncerEvent::SHUTDOWN_USE_WITH_CARE));
   delete channel;
 }
 
 TEST_F(SyncSessionTest, SetWriteTransaction) {
   TestDirectorySetterUpper db;
   db.SetUp();
   session_.reset(NULL);
-  context_.reset(new SyncSessionContext(NULL, NULL, db.manager(), this));
+  context_.reset(new SyncSessionContext(NULL, db.manager(), this));
   session_.reset(new SyncSession(context_.get(), this));
   context_->set_account_name(db.name());
   syncable::ScopedDirLookup dir(context_->directory_manager(),
                                 context_->account_name());
   ASSERT_TRUE(dir.good());
 
   SyncSession session(context_.get(), this);
   EXPECT_TRUE(NULL == session.write_transaction());
   {
     WriteTransaction trans(dir, syncable::UNITTEST, __FILE__, __LINE__);
@@ skipping 106 matching lines @@
   // Conflict resolution happens after get updates and commit,
   // so we need to loop back and get updates / commit again now
   // that we have made forward progress.
   status()->update_conflicts_resolved(true);
   EXPECT_TRUE(session_->HasMoreToSync());
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync