Patched in 265058 (which was uploaded under akalin@gmail.com). Original

description:

Numerous fixes to get parts of Chrome Sync to compile on OS X.

Fixes include:

- Added missing definitions for some static const class variables.
- Added some missing dependencies.
- Marked some Windows-only dependencies as such.
- Added stub files for some platform-specific classes.

BUG=none
TEST=Put through trybots.

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

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

5 files changed, 10 insertions, 7 deletions

diff --git a/chrome/browser/sync/glue/bookmark_model_worker.cc b/chrome/browser/sync/glue/bookmark_model_worker.cc
index b2a4589..fa30466 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker.cc
+++ b/chrome/browser/sync/glue/bookmark_model_worker.cc
@@ -112,3 +112,4 @@ void BookmarkModelWorker::CallDoWorkAndSignalTask::Run() {
 }  // namespace browser_sync
 
 #endif  // CHROME_PERSONALIZATION
+
diff --git a/chrome/browser/sync/glue/bookmark_model_worker.h b/chrome/browser/sync/glue/bookmark_model_worker.h
index 9cd67c6..7ac61e8 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker.h
+++ b/chrome/browser/sync/glue/bookmark_model_worker.h
@@ -131,4 +131,5 @@ class BookmarkModelWorker
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_WORKER_H_
 
-#endif  // CHROME_PERSONALIZATION
\ No newline at end of file
+#endif  // CHROME_PERSONALIZATION
+
diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h
index e9b15d4..c5c43f7 100644
--- a/chrome/browser/sync/glue/change_processor.h
+++ b/chrome/browser/sync/glue/change_processor.h
@@ -26,8 +26,8 @@ class ChangeProcessor : public BookmarkModelObserver,
                         public ChangeProcessingInterface {
  public:
   ChangeProcessor(UnrecoverableErrorHandler* error_handler)
-      : error_handler_(error_handler), model_associator_(NULL),
-        share_handle_(NULL), running_(false), bookmark_model_(NULL) {}
+      : running_(false), error_handler_(error_handler),
+        bookmark_model_(NULL), share_handle_(NULL), model_associator_(NULL) {}
   virtual ~ChangeProcessor() { Stop(); }
 
   // Call when the processor should accept changes from either provided model
diff --git a/chrome/browser/sync/glue/model_associator.h b/chrome/browser/sync/glue/model_associator.h
index a3b6e766e..6c3776e 100644
--- a/chrome/browser/sync/glue/model_associator.h
+++ b/chrome/browser/sync/glue/model_associator.h
@@ -140,4 +140,5 @@ class ModelAssociator
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCATOR_H_
-#endif  // CHROME_PERSONALIZATION
\ No newline at end of file
+#endif  // CHROME_PERSONALIZATION
+
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 93c7a9d..a875229 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -137,8 +137,8 @@ void SyncBackendHost::Core::SetBaseRequestContext(
 
 SyncBackendHost::Core::Core(SyncBackendHost* backend)
     : host_(backend),
-      syncapi_(new sync_api::SyncManager()),
-      base_request_context_(NULL) {
+      base_request_context_(NULL),
+      syncapi_(new sync_api::SyncManager()) {
 }
 
 SyncBackendHost::Core::~Core() {
@@ -192,7 +192,7 @@ void SyncBackendHost::Core::DoInitialize(
 #if defined (OS_WIN)
   path_str = host_->sync_data_folder_path().value();
 #elif (defined(OS_LINUX) || defined(OS_MACOSX))
-  path_str = UTF8ToUTF16(sync_data_folder_path().value());
+  path_str = UTF8ToUTF16(host_->sync_data_folder_path().value());
 #endif
   success = syncapi_->Init(path_str.c_str(),
       (service_url.host() + service_url.path()).c_str(),