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

chrome/browser/importer/firefox_profile_lock_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/path_service.h"
 #include "base/process_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/file_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FirefoxProfileLockTest : public testing::Test {
  protected:
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 93 matching lines @@
 
   lock1->Unlock();
   EXPECT_FALSE(lock1->HasAcquired());
 
   lock2->Lock();
   EXPECT_TRUE(lock2->HasAcquired());
   lock2->Unlock();
   EXPECT_FALSE(lock2->HasAcquired());
 }
 #endif