Use a direct include of strings headers in remoting/.

remoting/host/policy_hack/policy_watcher_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Most of this code is copied from various classes in
 // src/chrome/browser/policy. In particular, look at
 //
 //   configuration_policy_provider_delegate_win.{h,cc}
 //   configuration_policy_loader_win.{h,cc}
 //
 // This is a reduction of the functionality in those classes.
 
 #include "remoting/host/policy_hack/policy_watcher.h"
 
 #include <userenv.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "base/win/object_watcher.h"
 #include "base/win/registry.h"
 
 // userenv.dll is required for RegisterGPNotification().
 #pragma comment(lib, "userenv.lib")
 
 using base::win::RegKey;
@@ skipping 185 matching lines @@
   bool machine_policy_watcher_failed_;
 };
 
 PolicyWatcher* PolicyWatcher::Create(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   return new PolicyWatcherWin(task_runner);
 }
 
 }  // namespace policy_hack
 }  // namespace remoting