Index: content/test/test_browser_thread.cc |
=================================================================== |
--- content/test/test_browser_thread.cc (revision 111697) |
+++ content/test/test_browser_thread.cc (working copy) |
@@ -10,37 +10,13 @@ |
namespace content { |
-// This gives access to set_message_loop(). |
-class TestBrowserThreadImpl : public BrowserThreadImpl { |
- public: |
- explicit TestBrowserThreadImpl(BrowserThread::ID identifier) |
- : BrowserThreadImpl(identifier) { |
- } |
- |
- TestBrowserThreadImpl(BrowserThread::ID identifier, |
- MessageLoop* message_loop) |
- : BrowserThreadImpl(identifier, message_loop) { |
- } |
- |
- virtual ~TestBrowserThreadImpl() { |
- Stop(); |
- } |
- |
- void set_message_loop(MessageLoop* loop) { |
- Thread::set_message_loop(loop); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(TestBrowserThreadImpl); |
-}; |
- |
TestBrowserThread::TestBrowserThread(BrowserThread::ID identifier) |
- : impl_(new TestBrowserThreadImpl(identifier)) { |
+ : impl_(new BrowserThreadImpl(identifier)) { |
} |
TestBrowserThread::TestBrowserThread(BrowserThread::ID identifier, |
MessageLoop* message_loop) |
- : impl_(new TestBrowserThreadImpl(identifier, message_loop)) { |
+ : impl_(new BrowserThreadImpl(identifier, message_loop)) { |
} |
TestBrowserThread::~TestBrowserThread() { |
@@ -69,8 +45,4 @@ |
return impl_.get(); |
} |
-void TestBrowserThread::DeprecatedSetMessageLoop(MessageLoop* loop) { |
- impl_->set_message_loop(loop); |
-} |
- |
} // namespace content |