Remove the browser_sync flag.

BUG=none
TEST=none

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

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

8 files changed, 0 insertions, 30 deletions

diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index 7face7b..8dd0164 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -2,8 +2,6 @@
 // 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 "chrome/test/live_sync/bookmark_model_verifier.h"
 
 #include <vector>
@@ -251,5 +249,3 @@ const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model,
       BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url, NULL);
   return result;
 }
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/bookmark_model_verifier.h b/chrome/test/live_sync/bookmark_model_verifier.h
index de6d4c7..9961f3a5 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.h
+++ b/chrome/test/live_sync/bookmark_model_verifier.h
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(BROWSER_SYNC)
-
 #ifndef CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_
 #define CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_
 
@@ -112,5 +110,3 @@ class BookmarkModelVerifier {
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_BOOKMARK_MODEL_VERIFIER_H_
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.cc b/chrome/test/live_sync/live_bookmarks_sync_test.cc
index 6189965..59b99c2 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.cc
@@ -1,7 +1,6 @@
 // Copyright (c) 2006-2009 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 "chrome/test/live_sync/live_bookmarks_sync_test.h"
 
@@ -95,5 +94,3 @@ void LiveBookmarksSyncTest::SetUpInProcessBrowserTestFixture() {
 void LiveBookmarksSyncTest::TearDownInProcessBrowserTestFixture() {
   mock_host_resolver_override_.reset();
 }
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h
index f23a117..1502569 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.h
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.h
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(BROWSER_SYNC)
-
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
 
@@ -81,5 +79,3 @@ class LiveBookmarksSyncTest : public InProcessBrowserTest {
 };
 
 #endif  // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc
index 738654d..d047151 100644
--- a/chrome/test/live_sync/profile_sync_service_test_harness.cc
+++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc
@@ -1,7 +1,6 @@
 // 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 "base/message_loop.h"
 #include "chrome/browser/browser.h"
@@ -249,5 +248,3 @@ bool ProfileSyncServiceTestHarness::WaitForServiceInit() {
   }
   return service_->sync_initialized();
 }
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.h b/chrome/test/live_sync/profile_sync_service_test_harness.h
index ff51bd1..f242be3 100644
--- a/chrome/test/live_sync/profile_sync_service_test_harness.h
+++ b/chrome/test/live_sync/profile_sync_service_test_harness.h
@@ -1,7 +1,6 @@
 // Copyright (c) 2006-2009 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)
 
 #ifndef CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
 #define CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
@@ -107,5 +106,3 @@ class ProfileSyncServiceTestHarness : public ProfileSyncServiceObserver {
 };
 
 #endif  // CHROME_TEST_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.cc b/chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.cc
index 8e751cf..5e81e23 100644
--- a/chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.cc
+++ b/chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.cc
@@ -2,8 +2,6 @@
 // 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 "base/command_line.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
@@ -152,5 +150,3 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, DISABLED_GetUpdates) {
   EXPECT_EQ(status.summary, ProfileSyncService::Status::READY);
   EXPECT_EQ(status.unsynced_count, 0);
 }
-
-#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
index 49abebf..f82ee85 100644
--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
@@ -2,8 +2,6 @@
 // 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 <stdlib.h>
 
 #include "base/string16.h"
@@ -2483,6 +2481,3 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   Cleanup();
 }
-
-
-#endif  // defined(BROWSER_SYNC)