Cleanup more test code.

chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/profiles/profile.h"
+#include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
 
-#include "chrome/browser/profiles/profile.h"
-
 IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, OfflineToOnline) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   DisableNetwork(GetProfile(0));
   const BookmarkNode* node = AddGroup(0, L"title");
   SetTitle(0, node, L"new_title");
   ASSERT_FALSE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));
   ASSERT_EQ(ProfileSyncService::Status::OFFLINE_UNSYNCED,
             GetClient(0)->GetStatus().summary);
 
@@ skipping 101 matching lines @@
       GURL("http://mapleleafs.nhl.com"));
   const BookmarkNode* wynn = AddURL(0, bar, 1, L"Wynn",
       GURL("http://www.wynnlasvegas.com"));
 
   Move(0, wynn, tier3_b, 0);
   Move(0, leafs, tier3_b, 0);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Move after addition of bookmarks."));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }