summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics/metrics_log_unittest.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 03:43:56 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 03:43:56 +0000
commit64315b2ac09c63dd3d8da3a5c2d76a335691af05 (patch)
tree83c06b51f5b51a387427513a68e275291827393d /chrome/browser/metrics/metrics_log_unittest.cc
parentab2a7e3cda5f9f73b6e20b4e8d5cc1f526c91b32 (diff)
downloadchromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.zip
chromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.tar.gz
chromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.tar.bz2
dbus: Rename MockDBusTreadManagerWithoutGMock to FakeDBusThreadManager
The original name was a misnomer as the class behaves like a fake and hosts fake D-Bus client classes. No semantic changes. BUG=223061 TEST=none R=hashimoto@chromium.org, miket@chromium.org, nona@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/31793003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_log_unittest.cc')
-rw-r--r--chrome/browser/metrics/metrics_log_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index 2676dbf..0f96916 100644
--- a/chrome/browser/metrics/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -38,7 +38,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/fake_user_manager.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
+#include "chromeos/dbus/fake_dbus_thread_manager.h"
#endif // OS_CHROMEOS
using base::TimeDelta;
@@ -176,10 +176,9 @@ class MetricsLogTest : public testing::Test {
virtual void SetUp() OVERRIDE {
#if defined(OS_CHROMEOS)
- mock_dbus_thread_manager_ =
- new chromeos::MockDBusThreadManagerWithoutGMock();
+ fake_dbus_thread_manager_ = new chromeos::FakeDBusThreadManager();
chromeos::DBusThreadManager::InitializeForTesting(
- mock_dbus_thread_manager_);
+ fake_dbus_thread_manager_);
// Enable multi-profiles.
CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles);
@@ -208,7 +207,7 @@ class MetricsLogTest : public testing::Test {
base::MessageLoop message_loop_;
#if defined(OS_CHROMEOS)
- chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_;
+ chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;
scoped_ptr<base::FieldTrialList> field_trial_list_;
#endif // OS_CHROMEOS
};