Index: chrome/browser/extensions/extension_protocols_unittest.cc |
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc |
index 6848b567a6e6ef1c013cdcdfb593057c9246939c..f5d9085c2666fcc7b9d8f1a93bc35f61a4812224 100644 |
--- a/chrome/browser/extensions/extension_protocols_unittest.cc |
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc |
@@ -16,7 +16,7 @@ |
#include "chrome/common/url_constants.h" |
#include "content/public/browser/resource_request_info.h" |
#include "content/public/test/mock_resource_context.h" |
-#include "content/public/test/test_browser_thread.h" |
+#include "content/public/test/test_browser_thread_bundle.h" |
#include "extensions/common/constants.h" |
#include "net/url_request/url_request.h" |
#include "net/url_request/url_request_job_factory_impl.h" |
@@ -24,8 +24,6 @@ |
#include "net/url_request/url_request_test_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-using content::BrowserThread; |
- |
namespace extensions { |
scoped_refptr<Extension> CreateTestExtension(const std::string& name, |
@@ -88,9 +86,7 @@ scoped_refptr<Extension> CreateTestResponseHeaderExtension() { |
class ExtensionProtocolTest : public testing::Test { |
public: |
ExtensionProtocolTest() |
- : ui_thread_(BrowserThread::UI, &message_loop_), |
- file_thread_(BrowserThread::FILE, &message_loop_), |
- io_thread_(BrowserThread::IO, &message_loop_) {} |
+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} |
virtual void SetUp() OVERRIDE { |
testing::Test::SetUp(); |
@@ -127,10 +123,7 @@ class ExtensionProtocolTest : public testing::Test { |
} |
protected: |
- base::MessageLoopForIO message_loop_; |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread file_thread_; |
- content::TestBrowserThread io_thread_; |
+ content::TestBrowserThreadBundle thread_bundle_; |
scoped_refptr<ExtensionInfoMap> extension_info_map_; |
net::URLRequestJobFactoryImpl job_factory_; |
const net::URLRequestJobFactory* old_factory_; |