Use a direct include of strings headers in chrome/auto*/.

chrome/browser/autocomplete/bookmark_provider_unittest.cc

 // 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.
 
 #include "chrome/browser/autocomplete/bookmark_provider.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The bookmark corpus against which we will simulate searches.
@@ skipping 308 matching lines @@
           << query_data[i].matches[j] << "' for query: '"
           << query_data[i].query << "'.";
       if (j >= matches.size())
         continue;
       EXPECT_EQ(query_data[i].matches[j], UTF16ToUTF8(matches[j].description))
           << "    Mismatch at [" << base::IntToString(j) << "] for query '"
           << query_data[i].query << "'.";
     }
   }
 }