| Index: chrome/chrome_watcher/chrome_watcher_main.cc
|
| diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc
|
| index 18f4b5ab245fd150c3fa157af784c4c66ea892b1..1976c7ae099e09150b70fcb2ba2f9a86afdb4df5 100644
|
| --- a/chrome/chrome_watcher/chrome_watcher_main.cc
|
| +++ b/chrome/chrome_watcher/chrome_watcher_main.cc
|
| @@ -27,7 +27,6 @@
|
| #include "base/strings/string_piece.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "base/template_util.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
| @@ -443,5 +442,5 @@ extern "C" int WatcherMain(const base::char16* registry_path,
|
| }
|
|
|
| static_assert(
|
| - base::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value,
|
| + std::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value,
|
| "WatcherMain() has wrong type");
|
|
|