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

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

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

4 files changed, 9 insertions, 16 deletions

diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 3e3fb93..8dede7c 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -12,7 +12,9 @@
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : rph_factory_(),
       rvh_factory_(&rph_factory_) {
+#if defined(OS_WIN)
   OleInitialize(NULL);
+#endif
 }
 
 void BrowserWithTestWindowTest::SetUp() {
@@ -38,7 +40,9 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
   MessageLoop::current()->Run();
 
+#if defined(OS_WIN)
   OleUninitialize();
+#endif
 }
 
 TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(
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)
diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h
index 8aa657d..d785415 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/test_browser_window.h
@@ -7,18 +7,14 @@
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/test/test_location_bar.h"
 
 // An implementation of BrowserWindow used for testing. TestBrowserWindow only
-// contains a valid TabStrip, all other getters return NULL.
+// contains a valid LocationBar, all other getters return NULL.
 // See BrowserWithTestWindowTest for an example of using this class.
 class TestBrowserWindow : public BrowserWindow {
  public:
-  explicit TestBrowserWindow(Browser* browser)
-      : tab_strip_(browser->tabstrip_model()) {
-    tab_strip_.InitTabStripButtons();
-  }
+  explicit TestBrowserWindow(Browser* browser) {}
   virtual ~TestBrowserWindow() {}
 
   virtual void Init() {}
@@ -91,8 +87,6 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void DestroyBrowser() {}
 
  private:
-  TabStrip tab_strip_;
-
   TestLocationBar location_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);