Fix for negative routing info problem. We were replacing tokens after

failure multiple times.

BUG=39214
TEST=included new fancy unit test

Review URL: http://codereview.chromium.org/1294002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42738 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 6 deletions

diff --git a/chrome/test/sync/engine/syncer_command_test.h b/chrome/test/sync/engine/syncer_command_test.h
index a8814ac..92175ed 100644
--- a/chrome/test/sync/engine/syncer_command_test.h
+++ b/chrome/test/sync/engine/syncer_command_test.h
@@ -18,9 +18,10 @@ namespace browser_sync {
 // A test fixture that simplifies writing unit tests for individual
 // SyncerCommands, providing convenient access to a test directory
 // and a syncer session.
-class SyncerCommandTest : public testing::Test,
-                          public sessions::SyncSession::Delegate,
-                          public ModelSafeWorkerRegistrar {
+template<typename T>
+class SyncerCommandTestWithParam : public testing::TestWithParam<T>,
+                                   public sessions::SyncSession::Delegate,
+                                   public ModelSafeWorkerRegistrar {
  public:
   // SyncSession::Delegate implementation.
   virtual void OnSilencedUntil(const base::TimeTicks& silenced_until) {
@@ -51,8 +52,8 @@ class SyncerCommandTest : public testing::Test,
   }
 
  protected:
-  SyncerCommandTest() {}
-  virtual ~SyncerCommandTest() {}
+  SyncerCommandTestWithParam() {}
+  virtual ~SyncerCommandTestWithParam() {}
   virtual void SetUp() {
     syncdb_.SetUp();
     context_.reset(new sessions::SyncSessionContext(NULL, NULL,
@@ -90,9 +91,11 @@ class SyncerCommandTest : public testing::Test,
   scoped_ptr<sessions::SyncSession> session_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   ModelSafeRoutingInfo routing_info_;
-  DISALLOW_COPY_AND_ASSIGN(SyncerCommandTest);
+  DISALLOW_COPY_AND_ASSIGN(SyncerCommandTestWithParam);
 };
 
+class SyncerCommandTest : public SyncerCommandTestWithParam<void*> {};
+
 }  // namespace browser_sync
 
 #endif  // CHROME_TEST_SYNC_ENGINE_SYNCER_COMMAND_TEST_H_