summaryrefslogtreecommitdiffstats
path: root/chrome/browser/jankometer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/jankometer.cc')
-rw-r--r--chrome/browser/jankometer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index 8ace428..e1b3016 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.cc
@@ -54,7 +54,7 @@ class JankWatchdog : public Watchdog {
JankWatchdog(const TimeDelta& duration,
const std::string& thread_watched_name,
bool enabled)
- : Watchdog(duration, ASCIIToWide(thread_watched_name), enabled),
+ : Watchdog(duration, thread_watched_name, enabled),
thread_name_watched_(thread_watched_name),
alarm_count_(0) {
}
@@ -72,7 +72,7 @@ class JankWatchdog : public Watchdog {
std::string thread_name_watched_;
int alarm_count_;
- DISALLOW_EVIL_CONSTRUCTORS(JankWatchdog);
+ DISALLOW_COPY_AND_ASSIGN(JankWatchdog);
};
//------------------------------------------------------------------------------