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

chrome/test/test_browser_window.h

Index: chrome/test/test_browser_window.h
diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h
index 8aa657d15fa82b4702edc51f76bd663b63d40a7b..d7854159256143513ab2cdbbf8f62f0f54bbae0c 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);