| Index: chrome/browser/metrics/metrics_service_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/metrics/metrics_service_unittest.cc (revision 241317)
|
| +++ chrome/browser/metrics/metrics_service_unittest.cc (working copy)
|
| @@ -8,7 +8,6 @@
|
| #include <string>
|
|
|
| #include "base/command_line.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/scoped_testing_local_state.h"
|
| @@ -16,7 +15,7 @@
|
| #include "components/variations/metrics_util.h"
|
| #include "content/public/common/process_type.h"
|
| #include "content/public/common/webplugininfo.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/size.h"
|
|
|
| @@ -67,8 +66,7 @@
|
| class MetricsServiceTest : public testing::Test {
|
| public:
|
| MetricsServiceTest()
|
| - : ui_thread_(content::BrowserThread::UI, &message_loop_),
|
| - testing_local_state_(TestingBrowserProcess::GetGlobal()) {
|
| + : testing_local_state_(TestingBrowserProcess::GetGlobal()) {
|
| #if defined(OS_CHROMEOS)
|
| chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =
|
| new chromeos::FakeDBusThreadManager;
|
| @@ -114,8 +112,7 @@
|
| }
|
|
|
| private:
|
| - base::MessageLoopForUI message_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| + content::TestBrowserThreadBundle thread_bundle_;
|
| ScopedTestingLocalState testing_local_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);
|
|
|