Revert 105667 - Send important client side event information to the server. We create a class cal...

chrome/browser/sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2011 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 "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
@@ skipping 19 matching lines @@
     GetModelSafeRoutingInfo(&routes_);
   }
 
   SyncSession* MakeSession() {
     return new SyncSession(context_.get(), this, SyncSourceInfo(), routes_,
                            std::vector<ModelSafeWorker*>());
   }
 
   virtual void SetUp() {
     context_.reset(new SyncSessionContext(NULL, NULL, this,
-        std::vector<SyncEngineEventListener*>(), NULL));
+        std::vector<SyncEngineEventListener*>()));
     routes_.clear();
     routes_[syncable::BOOKMARKS] = GROUP_UI;
     routes_[syncable::AUTOFILL] = GROUP_UI;
     session_.reset(MakeSession());
   }
   virtual void TearDown() {
     session_.reset();
     context_.reset();
   }
 
@@ skipping 64 matching lines @@
     EXPECT_EQ(&resolver, context_->resolver());
   }
   EXPECT_FALSE(context_->resolver());
 }
 
 TEST_F(SyncSessionTest, SetWriteTransaction) {
   TestDirectorySetterUpper db;
   db.SetUp();
   session_.reset();
   context_.reset(new SyncSessionContext(NULL, db.manager(), this,
-      std::vector<SyncEngineEventListener*>(), NULL));
+      std::vector<SyncEngineEventListener*>()));
   session_.reset(MakeSession());
   context_->set_account_name(db.name());
   syncable::ScopedDirLookup dir(context_->directory_manager(),
                                 context_->account_name());
   ASSERT_TRUE(dir.good());
 
   scoped_ptr<SyncSession> session(MakeSession());
   EXPECT_TRUE(NULL == session->write_transaction());
   {
     WriteTransaction trans(FROM_HERE, syncable::UNITTEST, dir);
@@ skipping 340 matching lines @@
   EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
   EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
   EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
   EXPECT_EQ(payload2, original[syncable::SESSIONS]);
   EXPECT_EQ(payload3, original[syncable::THEMES]);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync