Use a direct include of strings headers in chrome/test/.

chrome/test/chromedriver/util.cc

 // Copyright (c) 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 "chrome/test/chromedriver/util.h"
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/rand_util.h"
-#include "base/string16.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/ui_events.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/chrome/zip.h"
 #include "chrome/test/chromedriver/key_converter.h"
 
 std::string GenerateId() {
   uint64 msb = base::RandUint64();
@@ skipping 364 matching lines @@
   if (first_file.empty())
     return Status(kUnknownError, "contained 0 files");
 
   base::FilePath second_file = enumerator.Next();
   if (!second_file.empty())
     return Status(kUnknownError, "contained multiple files");
 
   *file = first_file;
   return Status(kOk);
 }