Fix ProfileSyncService unit test.

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #if defined(BROWSER_SYNC)
 
 #include <stack>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/testing_profile.h"
+#include "chrome/test/sync/test_http_bridge_factory.h"
 
 using std::vector;
 using browser_sync::ChangeProcessingInterface;
 using browser_sync::ModelAssociator;
 using browser_sync::SyncBackendHost;
+using browser_sync::TestHttpBridgeFactory;
 
 class TestModelAssociator : public ModelAssociator {
  public:
   explicit TestModelAssociator(ProfileSyncService* service)
       : ModelAssociator(service) {
   }
 
   virtual bool GetSyncIdForTaggedNode(const string16& tag, int64* sync_id) {
     sync_api::WriteTransaction trans(
         sync_service()->backend()->GetUserShareHandle());
     sync_api::ReadNode root(&trans);
     root.InitByRootLookup();
 
     // First, try to find a node with the title among the root's children.
     // This will be the case if we are testing model persistence, and
     // are reloading a sync repository created earlier in the test.
+    int64 last_child_id = sync_api::kInvalidId;
     for (int64 id = root.GetFirstChildId(); id != sync_api::kInvalidId; /***/) {
       sync_api::ReadNode child(&trans);
-      if (!child.InitByIdLookup(id)) {
-        NOTREACHED();
-        break;
-      }
+      child.InitByIdLookup(id);
+      last_child_id = id;
       if (tag == child.GetTitle()) {
         *sync_id = id;
         return true;
       }
       id = child.GetSuccessorId();
     }
 
+    sync_api::ReadNode predecessor_node(&trans);
+    sync_api::ReadNode* predecessor = NULL;
+    if (last_child_id != sync_api::kInvalidId) {
+      predecessor_node.InitByIdLookup(last_child_id);
+      predecessor = &predecessor_node;
+    }
     sync_api::WriteNode node(&trans);
-    if (!node.InitByCreation(root, NULL))
-      return false;
+    // Create new fake tagged nodes at the end of the ordering.
+    node.InitByCreation(root, predecessor);
     node.SetIsFolder(true);
     node.SetTitle(tag.c_str());
     node.SetExternalId(0);
     *sync_id = node.GetId();
     return true;
   }
 };
 
 class TestProfileSyncService : public ProfileSyncService {
  public:
   explicit TestProfileSyncService(Profile* profile)
       : ProfileSyncService(profile) {
     RegisterPreferences();
     SetSyncSetupCompleted();
+
   }
   virtual ~TestProfileSyncService() {
   }
 
   virtual void InitializeBackend() {
     set_model_associator(new TestModelAssociator(this));
-    backend()->InitializeForTestMode(L"testuser");
+    TestHttpBridgeFactory* factory = new TestHttpBridgeFactory();
+    TestHttpBridgeFactory* factory2 = new TestHttpBridgeFactory();
+    backend()->InitializeForTestMode(L"testuser", factory, factory2);
     // The SyncBackend posts a task to the current loop when initialization
     // completes.
     MessageLoop::current()->Run();
     // Initialization is synchronous for test mode, so we should be good to go.
     DCHECK(sync_initialized());
   }
 
   virtual void OnBackendInitialized() {
     ProfileSyncService::OnBackendInitialized();
     MessageLoop::current()->Quit();
@@ skipping 1176 matching lines @@
   StartSyncService();
 
   // Make sure we're back in sync.  In real life, the user would need
   // to reauthenticate before this happens, but in the test, authentication
   // is sidestepped.
   ExpectBookmarkModelMatchesTestData();
   ExpectModelMatch();
 }
 
 #endif  // defined(BROWSER_SYNC)