Cleanup more test code.

chrome/test/live_sync/two_client_live_themes_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/test/live_sync/live_themes_sync_test.h"
-
 #include "base/basictypes.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/test/live_sync/live_themes_sync_test.h"
 
 class TwoClientLiveThemesSyncTest : public LiveThemesSyncTest {
  public:
   TwoClientLiveThemesSyncTest() : LiveThemesSyncTest(TWO_CLIENT) {}
   virtual ~TwoClientLiveThemesSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientLiveThemesSyncTest);
 };
 
@@ skipping 133 matching lines @@
   bool using_theme_0 =
       (GetCustomTheme(GetProfile(0)) == GetTheme(0)) &&
       HasOrWillHaveCustomTheme(GetProfile(1), GetTheme(0));
   bool using_theme_1 =
       HasOrWillHaveCustomTheme(GetProfile(0), GetTheme(1)) &&
       (GetCustomTheme(GetProfile(1)) == GetTheme(1));
 
   // Equivalent to using_theme_0 xor using_theme_1.
   ASSERT_NE(using_theme_0, using_theme_1);
 }