| Index: chrome/browser/browsing_data_cookie_helper_unittest.cc
|
| diff --git a/chrome/browser/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data_cookie_helper_unittest.cc
|
| index dda9b7e1fbfa1cf69499a047f6a45703e612c554..81ab3ff6df1ef6aa56df2105e508b5f0908e7b27 100644
|
| --- a/chrome/browser/browsing_data_cookie_helper_unittest.cc
|
| +++ b/chrome/browser/browsing_data_cookie_helper_unittest.cc
|
| @@ -9,7 +9,7 @@
|
| #include "base/message_loop.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| -#include "content/browser/browser_thread.h"
|
| +#include "content/test/test_browser_thread.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -30,10 +30,11 @@ class BrowsingDataCookieHelperTest : public testing::Test {
|
| }
|
|
|
| virtual void SetUp() {
|
| - ui_thread_.reset(new BrowserThread(BrowserThread::UI, &message_loop_));
|
| + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
|
| + &message_loop_));
|
| // Note: we're starting a real IO thread because parts of the
|
| // BrowsingDataCookieHelper expect to run on that thread.
|
| - io_thread_.reset(new BrowserThread(BrowserThread::IO));
|
| + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));
|
| ASSERT_TRUE(io_thread_->Start());
|
| testing_profile_.reset(new TestingProfile());
|
| base::WaitableEvent io_setup_complete(true, false);
|
| @@ -110,8 +111,8 @@ class BrowsingDataCookieHelperTest : public testing::Test {
|
|
|
| protected:
|
| MessageLoop message_loop_;
|
| - scoped_ptr<BrowserThread> ui_thread_;
|
| - scoped_ptr<BrowserThread> io_thread_;
|
| + scoped_ptr<content::TestBrowserThread> ui_thread_;
|
| + scoped_ptr<content::TestBrowserThread> io_thread_;
|
| scoped_ptr<TestingProfile> testing_profile_;
|
|
|
| net::CookieList cookie_list_;
|
|
|