Use a direct include of strings headers in url/, win8/.

url/url_util.h

 // Copyright 2013 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.
 
 #ifndef URL_URL_UTIL_H_
 #define URL_URL_UTIL_H_
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_canon.h"
 #include "url/url_export.h"
 #include "url/url_parse.h"
 
 namespace url_util {
 
 // Init ------------------------------------------------------------------------
 
 // Initialization is NOT required, it will be implicitly initialized when first
 // used. However, this implicit initialization is NOT threadsafe. If you are
@@ skipping 173 matching lines @@
 
 // Escapes the given string as defined by the JS method encodeURIComponent.  See
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/encodeURIComponent
 URL_EXPORT void EncodeURIComponent(const char* input, int length,
                                    url_canon::CanonOutput* output);
 
 
 }  // namespace url_util
 
 #endif  // URL_URL_UTIL_H_