summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui_test_utils.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:34:17 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:34:17 +0000
commite078590661444968a2c49a3e5464413714471dca (patch)
tree13a4dbe4dedccc8057361bd86c89e065390247fc /chrome/test/ui_test_utils.h
parentd9f76627b14170b95639619089139b6f0493ae8c (diff)
downloadchromium_src-e078590661444968a2c49a3e5464413714471dca.zip
chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.gz
chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.bz2
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
Diffstat (limited to 'chrome/test/ui_test_utils.h')
-rw-r--r--chrome/test/ui_test_utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index ae4a411..2709fa9 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -12,8 +12,8 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/scoped_temp_dir.h"
#include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
#include "base/string16.h"
#include "chrome/browser/ui/view_ids.h"
#include "chrome/test/automation/dom_element_proxy.h"