Use a direct include of strings headers in chromeos/.

chromeos/ime/xkeyboard.cc

 // 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.
 
 #include "chromeos/ime/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
 #include <utility>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.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_checker.h"
 
 // These includes conflict with base/tracked_objects.h so must come last.
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <glib.h>
 
 namespace chromeos {
 namespace input_method {
 namespace {
@@ skipping 339 matching lines @@
   return CheckLayoutName(layout_name);
 }
 
 // static
 XKeyboard* XKeyboard::Create() {
   return new XKeyboardImpl();
 }
 
 }  // namespace input_method
 }  // namespace chromeos