Use a direct include of strings headers in base/.

base/metrics/histogram_base.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 "base/metrics/histogram_base.h"
 
 #include <climits>
 
+#include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
-#include "base/json/json_string_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/pickle.h"
 #include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 
 namespace base {
 
 std::string HistogramTypeToString(HistogramType type) {
   switch(type) {
     case HISTOGRAM:
       return "HISTOGRAM";
     case LINEAR_HISTOGRAM:
       return "LINEAR_HISTOGRAM";
@@ skipping 124 matching lines @@
   return result;
 }
 
 void HistogramBase::WriteAsciiBucketValue(Count current,
                                           double scaled_sum,
                                           std::string* output) const {
   StringAppendF(output, " (%d = %3.1f%%)", current, current/scaled_sum);
 }
 
 }  // namespace base