Use a direct include of strings headers in base/.

base/win/win_util.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.
 
 #include "base/win/win_util.h"
 
 #include <aclapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <shobjidl.h>  // Must be before propkey.
 #include <initguid.h>
 #include <propkey.h>
 #include <propvarutil.h>
 #include <sddl.h>
 #include <signal.h>
 #include <stdlib.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 
 namespace {
 
 // Sets the value of |property_key| to |property_value| in |property_store|.
@@ skipping 308 matching lines @@
 #if defined(_MSC_FULL_VER)
   #pragma message(__PPOUT__(_MSC_FULL_VER))
 #endif
 
 #pragma message("Visual Studio 2012 x86 must be updated to at least Update 1")
 #error Must install Update 1 to Visual Studio 2012.
 #endif
 
 #endif  // _MSC_VER