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, 2 insertions, 5 deletions

diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 72eac2a..2db0f1e 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -233,13 +233,10 @@ class ProtocolHandlerRegistryTest : public testing::Test {
     ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
                                                     MessageLoop::current()));
     io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));
-    base::Thread::Options options;
-    options.message_loop_type = MessageLoop::TYPE_IO;
-    io_thread_->StartWithOptions(options);
+    io_thread_->StartIOThread();
 
     file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE));
-    options.message_loop_type = MessageLoop::TYPE_DEFAULT;
-    file_thread_->StartWithOptions(options);
+    file_thread_->Start();
 
     profile_.reset(new TestingProfile());
     profile_->SetPrefService(new TestingPrefService());