Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

chrome/browser/sync/glue/ui_model_worker_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "base/synchronization/waitable_event.h"
+#include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "content/browser/browser_thread.h"
-#include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::UIModelWorker;
 
 // Various boilerplate, primarily for the StopWithPendingWork test.
 
 class UIModelWorkerVisitor {
  public:
   UIModelWorkerVisitor(base::WaitableEvent* was_run,
                        bool quit_loop)
@@ skipping 194 matching lines @@
       new FakeSyncShareTask(syncer(), fox3.get()));
 
   // This is what gets the UI thread blocked until NotifyExitRequested,
   // which is called when FakeSyncapiShutdownTask runs and deletes the syncer.
   bmw()->Stop();
 
   // Was the thread killed?
   EXPECT_FALSE(syncer_thread()->IsRunning());
   core_thread()->Stop();
 }