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

Major changes:
- Moved sync_setup_{flow,wizard} to sync directory.
- Made browser_with_test_window_test compile on non-Windows platform.
- Moved localized contents font util functions to app/.

BUG=23073
TEST=trybot

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29253

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29255

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

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

2 files changed, 3 insertions, 8 deletions

diff --git a/chrome/test/sync/engine/mock_server_connection.cc b/chrome/test/sync/engine/mock_server_connection.cc
index 372d408..b2af891 100644
--- a/chrome/test/sync/engine/mock_server_connection.cc
+++ b/chrome/test/sync/engine/mock_server_connection.cc
@@ -43,9 +43,9 @@ MockConnectionManager::MockConnectionManager(DirectoryManager* dirmgr,
       directory_name_(name),
       mid_commit_callback_function_(NULL),
       mid_commit_observer_(NULL),
-      client_command_(NULL),
       throttling_(false),
       fail_non_periodic_get_updates_(false),
+      client_command_(NULL),
       next_position_in_parent_(2) {
     server_reachable_ = true;
 };
@@ -405,4 +405,5 @@ void MockConnectionManager::ThrottleNextRequest(
   throttling_ = true;
   if (visitor)
     visitor->VisitAtomically();
-}
\ No newline at end of file
+}
+
diff --git a/chrome/test/sync/engine/test_directory_setter_upper.cc b/chrome/test/sync/engine/test_directory_setter_upper.cc
index 2685795..9e910f0 100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.cc
+++ b/chrome/test/sync/engine/test_directory_setter_upper.cc
@@ -85,12 +85,6 @@ void ManuallyOpenedTestDirectorySetterUpper::TearDown() {
     TestDirectorySetterUpper::TearDown();
   }
 }
-    
-static PathString UTF8ToPathStringQuick(const std::string &str) {	
-  PathString ret;	
-  CHECK(browser_sync::UTF8ToPathString(str.data(), str.size(), &ret));	
-  return ret;	
-}
 
 TriggeredOpenTestDirectorySetterUpper::TriggeredOpenTestDirectorySetterUpper(
     const std::string& name)