diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
| commit | ea1a3f60aa4527939af680eda25c7697901f643c (patch) | |
| tree | 6835e11842b4ff04ec277a5f961cbf1853b95bae /base/win | |
| parent | a628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff) | |
| download | chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.zip chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.gz chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.bz2 | |
Move scoped_temp_dir from base to base/files
Also add to base namespace.
BUG=
Review URL: https://codereview.chromium.org/11359217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/event_trace_consumer_unittest.cc | 4 | ||||
| -rw-r--r-- | base/win/event_trace_controller_unittest.cc | 4 | ||||
| -rw-r--r-- | base/win/shortcut_unittest.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc index 327e1c7c..7af9452 100644 --- a/base/win/event_trace_consumer_unittest.cc +++ b/base/win/event_trace_consumer_unittest.cc @@ -12,9 +12,9 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/process.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/win/event_trace_controller.h" #include "base/win/event_trace_provider.h" @@ -356,7 +356,7 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest { } EventQueue events_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; FilePath temp_file_; }; diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc index 2e3a403..fae606e 100644 --- a/base/win/event_trace_controller_unittest.cc +++ b/base/win/event_trace_controller_unittest.cc @@ -9,9 +9,9 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/process.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/sys_info.h" #include "base/win/event_trace_controller.h" @@ -161,7 +161,7 @@ TEST_F(EtwTraceControllerTest, StartRealTimeSession) { } TEST_F(EtwTraceControllerTest, StartFileSession) { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp; ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir.path(), &temp)); diff --git a/base/win/shortcut_unittest.cc b/base/win/shortcut_unittest.cc index e13bc28..26b22be 100644 --- a/base/win/shortcut_unittest.cc +++ b/base/win/shortcut_unittest.cc @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/test/test_file_util.h" #include "base/test/test_shortcut_win.h" #include "base/win/scoped_com_initializer.h" @@ -62,8 +62,8 @@ class ShortcutTest : public testing::Test { } base::win::ScopedCOMInitializer com_initializer_; - ScopedTempDir temp_dir_; - ScopedTempDir temp_dir_2_; + base::ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_2_; // The link file to be created/updated in the shortcut tests below. FilePath link_file_; |