| Index: remoting/host/setup/daemon_controller_win.cc
|
| diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc
|
| index 1a2302946c9c7051ebe039080783d2286f1d6ee0..f0f23c8191a61e32f10a8cbbb2b3e89ae1f495ba 100644
|
| --- a/remoting/host/setup/daemon_controller_win.cc
|
| +++ b/remoting/host/setup/daemon_controller_win.cc
|
| @@ -14,10 +14,10 @@
|
| #include "base/json/json_writer.h"
|
| #include "base/logging.h"
|
| #include "base/string16.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time.h"
|
| #include "base/timer.h"
|
| -#include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "base/win/scoped_bstr.h"
|
| #include "base/win/scoped_comptr.h"
|
|
|