Switch to composition for TestBrowserThread.

This avoids exposing BrowserThreadImpl internals outside of content/,
and goes most of the way to not exposing the fact that underneath, it
is a base::Thread.  There are only three test files that use the
TestBrowserThread::DeprecatedGetThreadObject method.

TBR=owners
BUG=98716

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

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

1 files changed, 5 insertions, 7 deletions

diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
index b719f37..3bd0694 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
@@ -115,18 +115,16 @@ class ExtensionsActivityMonitorTest : public testing::Test {
   virtual void SetUp() {
     ui_thread_.Start();
     base::WaitableEvent service_created(false, false);
-    ui_thread_.message_loop()->PostTask(FROM_HERE,
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         new DoUIThreadSetupTask(&service_, &service_created));
     service_created.Wait();
   }
 
   virtual void TearDown() {
-    ui_thread_.message_loop()->DeleteSoon(FROM_HERE, service_);
+    BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, service_);
     ui_thread_.Stop();
   }
 
-  MessageLoop* ui_loop() { return ui_thread_.message_loop(); }
-
   static std::string GetExtensionIdForPath(
       const FilePath::StringType& extension_path) {
     std::string error;
@@ -182,7 +180,7 @@ TEST_F(ExtensionsActivityMonitorTest, Basic) {
   EXPECT_EQ(writes_by_extension1, results[id1].bookmark_write_count);
   EXPECT_EQ(writes_by_extension2, results[id2].bookmark_write_count);
 
-  ui_loop()->DeleteSoon(FROM_HERE, monitor);
+  BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, monitor);
 }
 
 TEST_F(ExtensionsActivityMonitorTest, Put) {
@@ -219,7 +217,7 @@ TEST_F(ExtensionsActivityMonitorTest, Put) {
   EXPECT_EQ(id2, new_records[id2].extension_id);
   EXPECT_EQ(5U, new_records[id1].bookmark_write_count);
   EXPECT_EQ(8U + 2U, new_records[id2].bookmark_write_count);
-  ui_loop()->DeleteSoon(FROM_HERE, monitor);
+  BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, monitor);
 }
 
 TEST_F(ExtensionsActivityMonitorTest, MultiGet) {
@@ -246,5 +244,5 @@ TEST_F(ExtensionsActivityMonitorTest, MultiGet) {
   EXPECT_EQ(1U, results.size());
   EXPECT_EQ(3U, results[id1].bookmark_write_count);
 
-  ui_loop()->DeleteSoon(FROM_HERE, monitor);
+  BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, monitor);
 }