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

chrome/browser/policy/config_dir_policy_provider_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 <algorithm>
 
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/policy/config_dir_policy_provider.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/json_value_serializer.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
@@ skipping 344 matching lines @@
             kPolicyBookmarkBarEnabled,
             key::kBookmarkBarEnabled),
         ValueTestParams::ForBooleanPolicy(
             kPolicyEditBookmarksEnabled,
             key::kEditBookmarksEnabled),
         ValueTestParams::ForListPolicy(
             kPolicyDisabledSchemes,
             key::kDisabledSchemes)));
 
 }  // namespace policy