Move some files in base to base/memory.

base/file_version_info_unittest.cc

 // Copyright (c) 2006-2008 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/file_util.h"
+#include "base/file_version_info.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/scoped_ptr.h"
-#include "base/file_version_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/file_version_info_win.h"
 #endif
 
 namespace {
 
 class FileVersionInfoTest : public testing::Test {
 };
@@ skipping 113 matching lines @@
   EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3",  &str));
   EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str);
   EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043",
             version_info_win->GetStringValue(L"Custom prop 3"));
 
   // Test an non-existing property.
   EXPECT_FALSE(version_info_win->GetValue(L"Unknown property",  &str));
   EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property"));
 }
 #endif