| Index: chrome/browser/spellchecker/spellcheck_service_unittest.cc
|
| diff --git a/chrome/browser/spellchecker/spellcheck_service_unittest.cc b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
|
| index 3189a0e8c3666326b1fed39a0397db38e2b9320b..f930f4e634a13ffccbcb2e5622012cc0fbd07371 100644
|
| --- a/chrome/browser/spellchecker/spellcheck_service_unittest.cc
|
| +++ b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
|
| @@ -11,11 +11,10 @@
|
| #include "chrome/browser/spellchecker/spellcheck_service.h"
|
| #include "chrome/common/spellcheck_common.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -using content::BrowserThread;
|
| using chrome::spellcheck_common::WordList;
|
|
|
| static BrowserContextKeyedService* BuildSpellcheckService(
|
| @@ -25,27 +24,15 @@ static BrowserContextKeyedService* BuildSpellcheckService(
|
|
|
| class SpellcheckServiceTest : public testing::Test {
|
| protected:
|
| - SpellcheckServiceTest()
|
| - : ui_thread_(BrowserThread::UI, &message_loop_),
|
| - file_thread_(BrowserThread::FILE, &message_loop_),
|
| - profile_(new TestingProfile()) {
|
| - }
|
| -
|
| virtual void SetUp() OVERRIDE {
|
| // Use SetTestingFactoryAndUse to force creation and initialization.
|
| SpellcheckServiceFactory::GetInstance()->SetTestingFactoryAndUse(
|
| - profile_.get(), &BuildSpellcheckService);
|
| + &profile_, &BuildSpellcheckService);
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| - base::MessageLoop::current()->RunUntilIdle();
|
| - }
|
| -
|
| - base::MessageLoop message_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| - content::TestBrowserThread file_thread_;
|
| -
|
| - scoped_ptr<TestingProfile> profile_;
|
| + private:
|
| + content::TestBrowserThreadBundle thread_bundle_;
|
| + TestingProfile profile_;
|
| };
|
|
|
| TEST_F(SpellcheckServiceTest, GetSpellCheckLanguages1) {
|
|
|