Use TestBrowserThreadBundle instead of TestBrowserThread in sync code.

chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc

 // Copyright 2013 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 "chrome/browser/sync/glue/extensions_activity_monitor.h"
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "sync/util/extensions_activity.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 
 namespace browser_sync {
 
 namespace {
 
-using content::BrowserThread;
 namespace keys = extensions::manifest_keys;
 
 // Create and return an extension with the given path.
 scoped_refptr<Extension> MakeExtension(const std::string& name) {
   base::FilePath path;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
   path = path.AppendASCII(name);
 
   base::DictionaryValue value;
   value.SetString(keys::kVersion, "1.0.0.0");
@@ skipping 18 matching lines @@
         chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
         content::Source<Extension>(extension.get()),
         content::Details<const extensions::BookmarksFunction>(
             bookmarks_function.get()));
   }
 }
 
 class SyncChromeExtensionsActivityMonitorTest : public testing::Test {
  public:
   SyncChromeExtensionsActivityMonitorTest()
-      : ui_thread_(BrowserThread::UI, &ui_loop_),
+      : thread_bundle_(content::TestBrowserThreadBundle::DEFAULT),
         extension1_(MakeExtension("extension1")),
         extension2_(MakeExtension("extension2")),
         id1_(extension1_->id()),
         id2_(extension2_->id()) {}
   virtual ~SyncChromeExtensionsActivityMonitorTest() {}
 
  private:
-  base::MessageLoop ui_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
  protected:
   ExtensionsActivityMonitor monitor_;
   scoped_refptr<Extension> extension1_;
   scoped_refptr<Extension> extension2_;
   // IDs of |extension{1,2}_|.
   const std::string& id1_;
   const std::string& id2_;
 };
 
@@ skipping 80 matching lines @@
   FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 3);
   monitor_.GetExtensionsActivity()->GetAndClearRecords(&results);
 
   EXPECT_EQ(1U, results.size());
   EXPECT_EQ(3U, results[id1_].bookmark_write_count);
 }
 
 }  // namespace
 
 }  // namespace browser_sync