summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/glue
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/glue')
-rw-r--r--chrome/browser/sync/glue/bookmark_model_worker.cc5
-rw-r--r--chrome/browser/sync/glue/bookmark_model_worker.h4
-rw-r--r--chrome/browser/sync/glue/bookmark_model_worker_unittest.cc4
-rw-r--r--chrome/browser/sync/glue/change_processor.cc4
-rw-r--r--chrome/browser/sync/glue/change_processor.h4
-rw-r--r--chrome/browser/sync/glue/http_bridge.cc4
-rw-r--r--chrome/browser/sync/glue/http_bridge.h4
-rw-r--r--chrome/browser/sync/glue/http_bridge_unittest.cc4
-rw-r--r--chrome/browser/sync/glue/model_associator.cc4
-rw-r--r--chrome/browser/sync/glue/model_associator.h4
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.cc4
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.h8
12 files changed, 26 insertions, 27 deletions
diff --git a/chrome/browser/sync/glue/bookmark_model_worker.cc b/chrome/browser/sync/glue/bookmark_model_worker.cc
index fa30466..2425269 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker.cc
+++ b/chrome/browser/sync/glue/bookmark_model_worker.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "chrome/browser/sync/glue/bookmark_model_worker.h"
@@ -111,5 +111,4 @@ void BookmarkModelWorker::CallDoWorkAndSignalTask::Run() {
} // namespace browser_sync
-#endif // CHROME_PERSONALIZATION
-
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/bookmark_model_worker.h b/chrome/browser/sync/glue/bookmark_model_worker.h
index 2c4520c..8b47729 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker.h
+++ b/chrome/browser/sync/glue/bookmark_model_worker.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_WORKER_H_
#define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_WORKER_H_
@@ -131,4 +131,4 @@ class BookmarkModelWorker
#endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_WORKER_H_
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc b/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
index 879948f..0576732 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
@@ -1,7 +1,7 @@
// 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.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "base/thread.h"
#include "chrome/browser/sync/engine/syncapi.h"
@@ -221,4 +221,4 @@ TEST_F(BookmarkModelWorkerTest, HypotheticalManualPumpFlooding) {
core_thread()->Stop();
}
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/change_processor.cc b/chrome/browser/sync/glue/change_processor.cc
index f5669cb..d90560f 100644
--- a/chrome/browser/sync/glue/change_processor.cc
+++ b/chrome/browser/sync/glue/change_processor.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "chrome/browser/sync/glue/change_processor.h"
@@ -542,4 +542,4 @@ void ChangeProcessor::SetSyncNodeFavicon(
} // namespace browser_sync
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h
index c5c43f7..355c058 100644
--- a/chrome/browser/sync/glue/change_processor.h
+++ b/chrome/browser/sync/glue/change_processor.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#ifndef CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_
#define CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_
@@ -185,4 +185,4 @@ class ChangeProcessor : public BookmarkModelObserver,
#endif // CHROME_BROWSER_SYNC_GLUE_CHANGE_APPLICATOR_H_
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index ebf0c7a..dfda3b5 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "chrome/browser/sync/glue/http_bridge.h"
@@ -225,4 +225,4 @@ void HttpBridge::OnURLFetchComplete(const URLFetcher *source, const GURL &url,
} // namespace browser_sync
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 3055ac8..6ddfcd3 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#ifndef CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
#define CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
@@ -182,4 +182,4 @@ class HttpBridgeFactory
#endif // CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc
index 62892af..32e0bc8 100644
--- a/chrome/browser/sync/glue/http_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/http_bridge_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "base/thread.h"
#include "chrome/browser/sync/glue/http_bridge.h"
@@ -207,4 +207,4 @@ TEST_F(HttpBridgeTest, TestExtraRequestHeaders) {
EXPECT_NE(std::string::npos, response.find(test_payload.c_str()));
}
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/model_associator.cc b/chrome/browser/sync/glue/model_associator.cc
index 29a8f01..8fc1411 100644
--- a/chrome/browser/sync/glue/model_associator.cc
+++ b/chrome/browser/sync/glue/model_associator.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "chrome/browser/sync/glue/model_associator.h"
@@ -509,4 +509,4 @@ bool ModelAssociator::LoadAssociations() {
} // namespace browser_sync
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/model_associator.h b/chrome/browser/sync/glue/model_associator.h
index 70fc486..d0db911 100644
--- a/chrome/browser/sync/glue/model_associator.h
+++ b/chrome/browser/sync/glue/model_associator.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCATOR_H_
#define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCATOR_H_
@@ -140,4 +140,4 @@ class ModelAssociator
} // namespace browser_sync
#endif // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCATOR_H_
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 0ff9d6b..0e24c80 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#include "build/build_config.h"
#include "base/file_version_info.h"
@@ -326,4 +326,4 @@ void SyncBackendHost::Core::SaveChanges() {
} // namespace browser_sync
-#endif
+#endif // defined(BROWSER_SYNC)
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 89c581e..b5473f0 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
#ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
#define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
@@ -114,7 +114,7 @@ class SyncBackendHost {
// GAIA) has confirmed the username is authentic.
string16 GetAuthenticatedUsername() const;
-#ifdef UNIT_TEST
+#if defined(UNIT_TEST)
// Called from unit test to bypass authentication and initialize the syncapi
// to a state suitable for testing but not production.
void InitializeForTestMode(const std::wstring& test_user) {
@@ -191,7 +191,7 @@ class SyncBackendHost {
sync_api::SyncManager* syncapi() { return syncapi_.get(); }
-#ifdef UNIT_TEST
+#if defined(UNIT_TEST)
// Special form of initialization that does not try and authenticate the
// last known user (since it will fail in test mode) and does some extra
// setup to nudge the syncapi into a useable state.
@@ -290,4 +290,4 @@ class SyncBackendHost {
} // namespace browser_sync
#endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
-#endif // CHROME_PERSONALIZATION
+#endif // defined(BROWSER_SYNC)
generated by cgit v1.1 at 2025-01-19 02:21:09 +0000