Move scoped_temp_dir and scoped_native_library back from base/memory to base.

webkit/support/simple_database_system.h

 // 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.
 
 #ifndef WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_
 #define WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_
 
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/platform_file.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h"
 #include "webkit/database/database_connections.h"
 #include "webkit/database/database_tracker.h"
 
 namespace base {
 class MessageLoopProxy;
@@ skipping 71 matching lines @@
 
   // Data members to support waiting for all connections to be closed.
   scoped_refptr<webkit_database::DatabaseConnectionsWrapper> open_connections_;
 
   static SimpleDatabaseSystem* instance_;
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(SimpleDatabaseSystem);
 
 #endif  // WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_