New authorization framework for sync. ...

chrome/browser/sync/sessions/sync_session_unittest.cc

Index: chrome/browser/sync/sessions/sync_session_unittest.cc
===================================================================
--- chrome/browser/sync/sessions/sync_session_unittest.cc	(revision 58702)
+++ chrome/browser/sync/sessions/sync_session_unittest.cc	(working copy)
@@ -27,7 +27,7 @@
     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() {
@@ -40,7 +40,7 @@
   }
   virtual bool IsSyncingCurrentlySilenced() {
     FailControllerInvocationIfDisabled("IsSyncingCurrentlySilenced");
-   return false;
+    return false;
   }
   virtual void OnReceivedLongPollIntervalUpdate(
       const base::TimeDelta& new_interval) {
@@ -51,7 +51,7 @@
     FailControllerInvocationIfDisabled("OnReceivedShortPollIntervalUpdate");
   }
   virtual void OnShouldStopSyncingPermanently() {
-      FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently");
+    FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently");
   }
 
   // ModelSafeWorkerRegistrar implementation.
@@ -110,7 +110,7 @@
   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(),