diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
| commit | e078590661444968a2c49a3e5464413714471dca (patch) | |
| tree | 13a4dbe4dedccc8057361bd86c89e065390247fc /chrome/browser/process_singleton_uitest.cc | |
| parent | d9f76627b14170b95639619089139b6f0493ae8c (diff) | |
| download | chromium_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/browser/process_singleton_uitest.cc')
| -rw-r--r-- | chrome/browser/process_singleton_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index 0d87622..65c41fa 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_uitest.cc @@ -15,14 +15,14 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/threading/thread.h" -#include "base/test/test_timeouts.h" +#include "base/scoped_temp_dir.h" #include "base/synchronization/waitable_event.h" -#include "chrome/common/chrome_paths.h" +#include "base/test/test_timeouts.h" +#include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/ui/ui_test.h" |