Made sync code build and pass unit tests on OS X.

chrome/browser/sync/sync_setup_wizard.h

 // 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.
 
-#ifndef CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_WIZARD_H_
-#define CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_WIZARD_H_
+#ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_
+#define CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_
 
 #include "base/basictypes.h"
 
-#if defined(OS_WIN)
-class SyncSetupFlowContainer;
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
+#else
+class SyncSetupFlowContainer;
 #endif
 
 class ProfileSyncService;
 
 class SyncSetupWizard {
  public:
   enum State {
     // Show the Google Account login UI.
     GAIA_LOGIN = 0,
     // A login attempt succeeded.  Depending on initial conditions, this may
@@ skipping 37 matching lines @@
   // gaia credentials in the event of a steady-state auth failure, this is
   // a "discrete" run (as in not a continuous wizard flow).  This returns
   // the end state to pass to Run for a given |start_state|.
   static State GetEndStateForDiscreteRun(State start_state);
 
   // Helper to return whether |state| warrants starting a new flow.
   static bool IsTerminalState(State state);
 
   ProfileSyncService* service_;
 
-#if defined(OS_WIN)
+#if defined(OS_LINUX)
+  bool visible_;
+#else
   SyncSetupFlowContainer* flow_container_;
-#elif defined(OS_LINUX)
-  bool visible_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupWizard);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_WIZARD_H_
+#endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_
+