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

chrome/browser/chromeos/login/signed_settings_temp_storage_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/signed_settings_temp_storage.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/logging_chrome.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class SignedSettingsTempStorageTest : public ::testing::Test {
  protected:
   virtual void SetUp() {
     ref_map_["some_stuff"] = "a=35;code=64";
@@ skipping 43 matching lines @@
     EXPECT_TRUE(SignedSettingsTempStorage::Retrieve(b_list[i]->first, &value,
                                                     local_state_.get()));
     EXPECT_EQ(b_list[i]->second, value);
     EXPECT_FALSE(SignedSettingsTempStorage::Retrieve("non-existent tv-series",
                                                      &value,
                                                      local_state_.get()));
   }
 }
 
 }  // namespace chromeos