Move some files in base to base/memory.

base/crypto/capi_util.cc

 // Copyright (c) 2010 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/crypto/capi_util.h"
 
 #include "base/basictypes.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 
 namespace {
 
 class CAPIUtilSingleton {
  public:
   static CAPIUtilSingleton* GetInstance() {
     return Singleton<CAPIUtilSingleton>::get();
   }
 
@@ skipping 22 matching lines @@
                                LPCWSTR container,
                                LPCWSTR provider,
                                DWORD prov_type,
                                DWORD flags)
 {
   base::AutoLock lock(CAPIUtilSingleton::GetInstance()->acquire_context_lock());
   return CryptAcquireContext(prov, container, provider, prov_type, flags);
 }
 
 }  // namespace base