Use a direct include of strings headers in content/renderer and content/shell.

content/renderer/hyphenator/hyphenator.h

 // 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.
 
 #ifndef CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_
 #define CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_handle.h"
 #include "base/platform_file.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "ipc/ipc_platform_file.h"
 
 typedef struct _HyphenDict HyphenDict;
 
 namespace content {
 class RenderThread;
 
 // A class that hyphenates a word. This class encapsulates the hyphen library
@@ skipping 42 matching lines @@
   string16 word_;
   bool result_;
   std::vector<int> hyphen_offsets_;
 
   DISALLOW_COPY_AND_ASSIGN(Hyphenator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_HYPHENATOR_HYPHENATOR_H_