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

chrome/browser/net/sqlite_persistent_cookie_store_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.
 
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/time.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/thread_test_helper.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SQLitePersistentCookieStoreTest : public testing::Test {
@@ skipping 154 matching lines @@
   ASSERT_EQ(0, counter->callback_count());
 
   store_->Flush(NewRunnableMethod(counter.get(), &CallbackCounter::Callback));
 
   scoped_refptr<ThreadTestHelper> helper(
       new ThreadTestHelper(BrowserThread::DB));
   ASSERT_TRUE(helper->Run());
 
   ASSERT_EQ(1, counter->callback_count());
 }