| Index: remoting/host/config_file_watcher.cc
|
| diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc
|
| index 07560855027653a9f772e17563c26dd12371d245..85d38e032f1de9a893a0c101b2a9c2f8e2a39d84 100644
|
| --- a/remoting/host/config_file_watcher.cc
|
| +++ b/remoting/host/config_file_watcher.cc
|
| @@ -68,7 +68,7 @@ class ConfigFileWatcherImpl
|
| std::string config_;
|
| base::FilePath config_path_;
|
|
|
| - scoped_ptr<base::DelayTimer<ConfigFileWatcherImpl> > config_updated_timer_;
|
| + scoped_ptr<base::DelayTimer> config_updated_timer_;
|
|
|
| // Number of times an attempt to read the configuration file failed.
|
| int retries_;
|
| @@ -134,9 +134,9 @@ void ConfigFileWatcherImpl::WatchOnIoThread() {
|
|
|
| // Create the timer that will be used for delayed-reading the configuration
|
| // file.
|
| - config_updated_timer_.reset(new base::DelayTimer<ConfigFileWatcherImpl>(
|
| - FROM_HERE, base::TimeDelta::FromSeconds(2), this,
|
| - &ConfigFileWatcherImpl::ReloadConfig));
|
| + config_updated_timer_.reset(
|
| + new base::DelayTimer(FROM_HERE, base::TimeDelta::FromSeconds(2), this,
|
| + &ConfigFileWatcherImpl::ReloadConfig));
|
|
|
| // Start watching the configuration file.
|
| config_watcher_.reset(new base::FilePathWatcher());
|
|
|