Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)

base/metrics/histogram_unittest.cc

 // Copyright (c) 2011 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.
 
 // Test of Histogram class
 
+#include <algorithm>
+#include <vector>
+
+#include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
-#include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace {
 
 class HistogramTest : public testing::Test {
 };
 
 // Check for basic syntax and use.
@@ skipping 396 matching lines @@
       if (checksum & 1)
         checksum = kReversedPolynomial ^ (checksum >> 1);
       else
         checksum >>= 1;
     }
     EXPECT_EQ(Histogram::kCrcTable[i], checksum);
   }
 }
 
 }  // namespace base