Revert 72685 - [SYNC] Refactor SyncSourceInfo and add support in chrome inval...

chrome/test/sync/engine/syncer_command_test.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_TEST_SYNC_ENGINE_SYNCER_COMMAND_TEST_H_
 #define CHROME_TEST_SYNC_ENGINE_SYNCER_COMMAND_TEST_H_
 #pragma once
 
-#include <algorithm>
-#include <string>
 #include <vector>
 
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/test/sync/engine/mock_connection_manager.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
@@ skipping 56 matching lines @@
     ResetContext();
   }
   virtual void TearDown() {
     syncdb_->TearDown();
   }
 
   TestDirectorySetterUpper* syncdb() { return syncdb_.get(); }
   sessions::SyncSessionContext* context() const { return context_.get(); }
   sessions::SyncSession::Delegate* delegate() { return this; }
   ModelSafeWorkerRegistrar* registrar() { return this; }
-  // Lazily create a session requesting all datatypes.
+  // Lazily create a session.
   sessions::SyncSession* session() {
     if (!session_.get()) {
       std::vector<ModelSafeWorker*> workers;
       GetWorkers(&workers);
-      ModelSafeRoutingInfo routes = routing_info();
-      sessions::TypePayloadMap types =
-          sessions::RoutingInfoToTypePayloadMap(routes, std::string());
       session_.reset(new sessions::SyncSession(context(), delegate(),
-          sessions::SyncSourceInfo(sync_pb::GetUpdatesCallerInfo::UNKNOWN,
-                                   types),
-          routing_info_, workers));
+          sessions::SyncSourceInfo(), routing_info_, workers));
     }
     return session_.get();
   }
   void ClearSession() {
     session_.reset();
   }
 
   void ResetContext() {
     context_.reset(new sessions::SyncSessionContext(
         mock_server_.get(), syncdb_->manager(), registrar(),
@@ skipping 40 matching lines @@
       : SyncerCommandTestWithParam<void*>(
           SyncerCommandTestWithParam<void*>::USE_MOCK_DIRECTORY) {}
   MockDirectorySetterUpper::MockDirectory* mock_directory() {
     return static_cast<MockDirectorySetterUpper*>(syncdb())->directory();
   }
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_TEST_SYNC_ENGINE_SYNCER_COMMAND_TEST_H_