Fix leak in MetricsLogTest.InitialLogStabilityMetrics test.

chrome/browser/metrics/metrics_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/metrics_service.h"
 
 #include <ctype.h>
 #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"
 #include "chrome/test/base/testing_browser_process.h"
 #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"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #endif  // OS_CHROMEOS
 
@@ skipping 30 matching lines @@
   virtual int GetScreenCount() const OVERRIDE {
     return 1;
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestMetricsLog);
 };
 
 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;
     fake_dbus_thread_manager->SetBluetoothAdapterClient(
         scoped_ptr<chromeos::BluetoothAdapterClient>(
             new chromeos::FakeBluetoothAdapterClient));
     fake_dbus_thread_manager->SetBluetoothDeviceClient(
         scoped_ptr<chromeos::BluetoothDeviceClient>(
             new chromeos::FakeBluetoothDeviceClient));
     fake_dbus_thread_manager->SetBluetoothInputClient(
@@ skipping 25 matching lines @@
     for (std::vector<chrome_variations::ActiveGroupId>::const_iterator it =
              synthetic_trials.begin();
          it != synthetic_trials.end(); ++it) {
       if ((*it).name == trial_name_hash && (*it).group == trial_group_hash)
         return true;
     }
     return false;
   }
 
  private:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   ScopedTestingLocalState testing_local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);
 };
 
 }  // namespace
 
 // Ensure the ClientId is formatted as expected.
 TEST_F(MetricsServiceTest, ClientIdCorrectlyFormatted) {
   std::string clientid = MetricsService::GenerateClientID();
@@ skipping 186 matching lines @@
   service.log_manager_.FinishCurrentLog();
   service.log_manager_.BeginLoggingWithLog(new MetricsLog("clientID", 1),
                                            MetricsLog::ONGOING_LOG);
   service.GetCurrentSyntheticFieldTrials(&synthetic_trials);
   EXPECT_EQ(3U, synthetic_trials.size());
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial1", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial2", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial3", "Group3"));
   service.log_manager_.FinishCurrentLog();
 }