Update from https://crrev.com/333737

base/metrics/sample_vector_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 "base/metrics/sample_vector.h"
+
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/bucket_ranges.h"
 #include "base/metrics/histogram.h"
-#include "base/metrics/sample_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using std::vector;
-
 namespace base {
 namespace {
 
 TEST(SampleVectorTest, AccumulateTest) {
   // Custom buckets: [1, 5) [5, 10)
   BucketRanges ranges(3);
   ranges.set_range(0, 1);
   ranges.set_range(1, 5);
   ranges.set_range(2, 10);
   SampleVector samples(&ranges);
@@ skipping 147 matching lines @@
 // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
 
 TEST(SampleVectorIteratorTest, IterateTest) {
   BucketRanges ranges(5);
   ranges.set_range(0, 0);
   ranges.set_range(1, 1);
   ranges.set_range(2, 2);
   ranges.set_range(3, 3);
   ranges.set_range(4, 4);
 
-  vector<HistogramBase::Count> counts(3);
+  std::vector<HistogramBase::Count> counts(3);
   counts[0] = 1;
   counts[1] = 0;  // Iterator will bypass this empty bucket.
   counts[2] = 2;
 
   // BucketRanges can have larger size than counts.
   SampleVectorIterator it(&counts, &ranges);
   size_t index;
 
   HistogramBase::Sample min;
   HistogramBase::Sample max;
@@ skipping 63 matching lines @@
   samples.Accumulate(2, 100);
   it = samples.Iterator();
   EXPECT_FALSE(it->Done());
 }
 
 #endif
 // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
 
 }  // namespace
 }  // namespace base