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 /chrome_frame/test/test_with_web_server.h | |
| 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 'chrome_frame/test/test_with_web_server.h')
| -rw-r--r-- | chrome_frame/test/test_with_web_server.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index 821afe9..fe03b0f 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -8,7 +8,7 @@ #include <windows.h> #include <string> -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -16,8 +16,8 @@ #include "chrome_frame/chrome_tab.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/test_server.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" // Specifies the invocation method for CF. class CFInvocation { @@ -238,7 +238,7 @@ class ChromeFrameTestWithWebServer : public testing::Test { static FilePath chrome_user_data_dir_; // The user data directory used for Chrome instances. - static ScopedTempDir temp_dir_; + static base::ScopedTempDir temp_dir_; // The web server from which we serve the web! static chrome_frame_test::TimedMsgLoop* loop_; |