Move some files in base to base/memory.

base/i18n/file_util_icu.cc

 // Copyright (c) 2009 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.
 
 // File utilities that use the ICU library go in this file.
 
 #include "base/i18n/file_util_icu.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
-#include "base/singleton.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "unicode/coll.h"
 #include "unicode/uniset.h"
 
 namespace {
 
 class IllegalCharacters {
@@ skipping 168 matching lines @@
   // TODO(yuzo): Perhaps we should define SysNativeMBToUTF16?
   return LocaleAwareComparator::GetInstance()->Compare(
       WideToUTF16(base::SysNativeMBToWide(a.value().c_str())),
       WideToUTF16(base::SysNativeMBToWide(b.value().c_str()))) < 0;
 #else
   #error Not implemented on your system
 #endif
 }
 
 }  // namespace