4 files changed, 16 insertions, 9 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 8dede7c..3e3fb93 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -12,9 +12,7 @@
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : rph_factory_(),
       rvh_factory_(&rph_factory_) {
-#if defined(OS_WIN)
   OleInitialize(NULL);
-#endif
 }
 
 void BrowserWithTestWindowTest::SetUp() {
@@ -40,9 +38,7 @@ 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 b2af891..372d408 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,5 +405,4 @@ 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 9e910f0..2685795 100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.cc
+++ b/chrome/test/sync/engine/test_directory_setter_upper.cc
@@ -85,6 +85,12 @@ 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 d785415..8aa657d 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/test_browser_window.h
@@ -7,14 +7,18 @@
 
 #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 LocationBar, all other getters return NULL.
+// contains a valid TabStrip, all other getters return NULL.
 // See BrowserWithTestWindowTest for an example of using this class.
 class TestBrowserWindow : public BrowserWindow {
  public:
-  explicit TestBrowserWindow(Browser* browser) {}
+  explicit TestBrowserWindow(Browser* browser)
+      : tab_strip_(browser->tabstrip_model()) {
+    tab_strip_.InitTabStripButtons();
+  }
   virtual ~TestBrowserWindow() {}
 
   virtual void Init() {}
@@ -87,6 +91,8 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void DestroyBrowser() {}
 
  private:
+  TabStrip tab_strip_;
+
   TestLocationBar location_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);