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

chrome/browser/chromeos/login/owner_manager_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 "chrome/browser/chromeos/login/owner_manager.h"
 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
+#include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
+#include "content/browser/browser_thread.h"
 #include "crypto/nss_util.h"
 #include "crypto/rsa_private_key.h"
-#include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
-#include "content/browser/browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::crypto::RSAPrivateKey;
 using ::testing::DoAll;
 using ::testing::Eq;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
 using ::testing::_;
@@ skipping 283 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(manager.get(),
                         &OwnerManager::Sign,
                         BrowserThread::UI,
                         data,
                         &delegate));
   message_loop_.Run();
 }
 
 }  // namespace chromeos