Use a direct include of strings headers in base/.

base/test/expectations/parser.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 "base/test/expectations/parser.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace test_expectations {
 
 Parser::Parser(Delegate* delegate, const std::string& input)
     : delegate_(delegate),
       input_(input),
       pos_(NULL),
       end_(NULL),
       line_number_(0),
       data_error_(false) {
@@ skipping 174 matching lines @@
   delegate_->OnSyntaxError(message);
   return NULL;
 }
 
 void Parser::DataError(const std::string& error) {
   data_error_ = true;
   delegate_->OnDataError(error);
 }
 
 }  // namespace test_expectations