From e078590661444968a2c49a3e5464413714471dca Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 19 May 2011 23:34:17 +0000 Subject: Move scoped_temp_dir and scoped_native_library back from base/memory to base. It looks like they got moved accidentally in http://codereview.chromium.org/6714032 BUG=none TEST=none Review URL: http://codereview.chromium.org/7048007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86010 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/prefs/pref_service_uitest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/prefs') diff --git a/chrome/browser/prefs/pref_service_uitest.cc b/chrome/browser/prefs/pref_service_uitest.cc index af2b1a6..029fc75 100644 --- a/chrome/browser/prefs/pref_service_uitest.cc +++ b/chrome/browser/prefs/pref_service_uitest.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/scoped_temp_dir.h" #include "base/test/test_file_util.h" #include "base/values.h" -#include "base/memory/scoped_temp_dir.h" #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -- cgit v1.1