Use a direct include of strings headers in base/.

base/win/win_util_unittest.cc

 // Copyright (c) 2010 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 <windows.h>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace win {
 
 namespace {
 
 // Saves the current thread's locale ID when initialized, and restores it when
@@ skipping 30 matching lines @@
 TEST(BaseWinUtilTest, TestGetNonClientMetrics) {
   NONCLIENTMETRICS metrics = {0};
   GetNonClientMetrics(&metrics);
   EXPECT_TRUE(metrics.cbSize > 0);
   EXPECT_TRUE(metrics.iScrollWidth > 0);
   EXPECT_TRUE(metrics.iScrollHeight > 0);
 }
 
 }  // namespace win
 }  // namespace base