[SyncFS] Make the snapshot sync of local-to-remote sync parallelization enabled. (2/3)

chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc

 // Copyright 2013 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_file_system/local/local_file_change_tracker.h"
 
 #include <deque>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 218 matching lines @@
   EXPECT_EQ(URL(kPath5), urls_to_process[1]);
   EXPECT_EQ(URL(kPath4), urls_to_process[2]);
 
   // Promote changes.
   EXPECT_TRUE(change_tracker()->PromoteDemotedChanges());
 
   // Now we should have kPath1 and kPath3.
   urls_to_process.clear();
   change_tracker()->GetNextChangedURLs(&urls_to_process, 0);
   ASSERT_EQ(5U, urls_to_process.size());
-  EXPECT_EQ(URL(kPath2), urls_to_process[0]);
-  EXPECT_EQ(URL(kPath5), urls_to_process[1]);
-  EXPECT_EQ(URL(kPath4), urls_to_process[2]);
-  EXPECT_TRUE(URL(kPath1) == urls_to_process[3] ||
-              URL(kPath1) == urls_to_process[4]);
-  EXPECT_TRUE(URL(kPath3) == urls_to_process[3] ||
-              URL(kPath3) == urls_to_process[4]);
+  EXPECT_EQ(URL(kPath1), urls_to_process[0]);
+  EXPECT_EQ(URL(kPath2), urls_to_process[1]);
+  EXPECT_EQ(URL(kPath3), urls_to_process[2]);
+  EXPECT_EQ(URL(kPath5), urls_to_process[3]);
+  EXPECT_EQ(URL(kPath4), urls_to_process[4]);
 
   // No changes to promote any more.
   EXPECT_FALSE(change_tracker()->PromoteDemotedChanges());
 
 
   VerifyAndClearChange(URL(kPath1),
                FileChange(FileChange::FILE_CHANGE_DELETE,
                           sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
   VerifyAndClearChange(URL(kPath2),
                FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
@@ skipping 451 matching lines @@
 
   // Make sure they're gone from the database too.
   DropChangesInTracker();
   RestoreChangesFromTrackerDB();
 
   GetAllChangedURLs(&urls);
   EXPECT_TRUE(urls.empty());
 }
 
 }  // namespace sync_file_system