summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automation/proxy_launcher.h4
-rw-r--r--chrome/test/base/in_process_browser_test.h4
-rw-r--r--chrome/test/base/testing_profile.h4
-rw-r--r--chrome/test/base/testing_profile_manager.h4
-rw-r--r--chrome/test/base/ui_test_utils.cc2
-rw-r--r--chrome/test/chromedriver/chrome_impl.cc2
-rw-r--r--chrome/test/chromedriver/chrome_impl.h6
-rw-r--r--chrome/test/chromedriver/chrome_launcher_impl.cc2
-rw-r--r--chrome/test/logging/win/test_log_collector.cc4
-rw-r--r--chrome/test/ui/ui_test.cc4
-rw-r--r--chrome/test/webdriver/commands/create_session.cc2
-rw-r--r--chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc10
-rw-r--r--chrome/test/webdriver/webdriver_session.cc2
-rw-r--r--chrome/test/webdriver/webdriver_session.h4
-rw-r--r--chrome/test/webdriver/webdriver_util.cc6
-rw-r--r--chrome/test/webdriver/webdriver_util_unittest.cc4
16 files changed, 32 insertions, 32 deletions
diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h
index 763012d..1c6569b 100644
--- a/chrome/test/automation/proxy_launcher.h
+++ b/chrome/test/automation/proxy_launcher.h
@@ -11,9 +11,9 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/process.h"
-#include "base/scoped_temp_dir.h"
#include "base/time.h"
class AutomationProxy;
@@ -160,7 +160,7 @@ class ProxyLauncher {
// We use a temporary directory for profile to avoid issues with being
// unable to delete some files because they're in use, etc.
- ScopedTempDir temp_profile_dir_;
+ base::ScopedTempDir temp_profile_dir_;
// Handle to the first Chrome process.
base::ProcessHandle process_;
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 2747f7a..de72dc2 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -6,9 +6,9 @@
#define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
#include "base/compiler_specific.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
#include "content/public/common/page_transition_types.h"
#include "content/public/test/browser_test.h"
#include "content/public/test/browser_test_base.h"
@@ -196,7 +196,7 @@ class InProcessBrowserTest : public content::BrowserTestBase {
// Temporary user data directory. Used only when a user data directory is not
// specified in the command line.
- ScopedTempDir temp_user_data_dir_;
+ base::ScopedTempDir temp_user_data_dir_;
#if defined(OS_CHROMEOS)
chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index d583854..244ba79 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -7,9 +7,9 @@
#include <string>
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
#include "base/timer.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/profiles/profile.h"
@@ -357,7 +357,7 @@ class TestingProfile : public Profile {
// We use a temporary directory to store testing profile data. In a multi-
// profile environment, this is invalid and the directory is managed by the
// TestingProfileManager.
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
// The path to this profile. This will be valid in either of the two above
// cases.
FilePath profile_path_;
diff --git a/chrome/test/base/testing_profile_manager.h b/chrome/test/base/testing_profile_manager.h
index 9b72f55..d37f044 100644
--- a/chrome/test/base/testing_profile_manager.h
+++ b/chrome/test/base/testing_profile_manager.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/compiler_specific.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/string16.h"
#include "chrome/test/base/testing_pref_service.h"
@@ -75,7 +75,7 @@ class TestingProfileManager {
bool called_set_up_;
// The directory in which new profiles are placed.
- ScopedTempDir profiles_dir_;
+ base::ScopedTempDir profiles_dir_;
// Weak reference to the browser process on which the ProfileManager is set.
TestingBrowserProcess* browser_process_;
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 5244a0a..2d9abdb 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -423,7 +423,7 @@ void WaitForHistoryToLoad(HistoryService* history_service) {
}
void DownloadURL(Browser* browser, const GURL& download_url) {
- ScopedTempDir downloads_directory;
+ base::ScopedTempDir downloads_directory;
ASSERT_TRUE(downloads_directory.CreateUniqueTempDir());
browser->profile()->GetPrefs()->SetFilePath(
prefs::kDownloadDefaultDirectory, downloads_directory.path());
diff --git a/chrome/test/chromedriver/chrome_impl.cc b/chrome/test/chromedriver/chrome_impl.cc
index 04fe0cf..5cac6f3 100644
--- a/chrome/test/chromedriver/chrome_impl.cc
+++ b/chrome/test/chromedriver/chrome_impl.cc
@@ -9,7 +9,7 @@
#include "chrome/test/chromedriver/status.h"
ChromeImpl::ChromeImpl(base::ProcessHandle process,
- ScopedTempDir* user_data_dir)
+ base::ScopedTempDir* user_data_dir)
: process_(process) {
if (user_data_dir->IsValid()) {
CHECK(user_data_dir_.Set(user_data_dir->Take()));
diff --git a/chrome/test/chromedriver/chrome_impl.h b/chrome/test/chromedriver/chrome_impl.h
index c30f498..1a6d1c8 100644
--- a/chrome/test/chromedriver/chrome_impl.h
+++ b/chrome/test/chromedriver/chrome_impl.h
@@ -6,15 +6,15 @@
#define CHROME_TEST_CHROMEDRIVER_CHROME_IMPL_H_
#include "base/compiler_specific.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/process.h"
-#include "base/scoped_temp_dir.h"
#include "chrome/test/chromedriver/chrome.h"
class Status;
class ChromeImpl : public Chrome {
public:
- ChromeImpl(base::ProcessHandle process, ScopedTempDir* user_data_dir);
+ ChromeImpl(base::ProcessHandle process, base::ScopedTempDir* user_data_dir);
virtual ~ChromeImpl();
// Overridden from Chrome:
@@ -22,7 +22,7 @@ class ChromeImpl : public Chrome {
private:
base::ProcessHandle process_;
- ScopedTempDir user_data_dir_;
+ base::ScopedTempDir user_data_dir_;
};
#endif // CHROME_TEST_CHROMEDRIVER_CHROME_IMPL_H_
diff --git a/chrome/test/chromedriver/chrome_launcher_impl.cc b/chrome/test/chromedriver/chrome_launcher_impl.cc
index 85eb108..3e124fb 100644
--- a/chrome/test/chromedriver/chrome_launcher_impl.cc
+++ b/chrome/test/chromedriver/chrome_launcher_impl.cc
@@ -31,7 +31,7 @@ Status ChromeLauncherImpl::Launch(
CommandLine command(program);
command.AppendSwitch("enable-logging");
command.AppendSwitchASCII("logging-level", "1");
- ScopedTempDir user_data_dir;
+ base::ScopedTempDir user_data_dir;
if (!user_data_dir.CreateUniqueTempDir())
return Status(kUnknownError, "cannot create temp dir for user data dir");
command.AppendSwitchPath("user-data-dir", user_data_dir.path());
diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc
index cff55b1..3dbbfe6 100644
--- a/chrome/test/logging/win/test_log_collector.cc
+++ b/chrome/test/logging/win/test_log_collector.cc
@@ -13,10 +13,10 @@
#include "base/compiler_specific.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
#include "base/stringprintf.h"
#include "chrome/test/base/test_switches.h"
#include "chrome/test/logging/win/file_logger.h"
@@ -136,7 +136,7 @@ class TestLogCollector {
// A temporary directory into which a log file is placed for the duration of
// each test. Created/destroyed at collector SetUp and TearDown.
- ScopedTempDir log_temp_dir_;
+ base::ScopedTempDir log_temp_dir_;
// The test logger. Initialized/Unintitialized at collector SetUp and
// TearDown.
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index fd695b2..938f9c8 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -18,12 +18,12 @@
#include "base/environment.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_temp_dir.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "base/test/test_file_util.h"
@@ -47,9 +47,9 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/base/chrome_process_util.h"
-#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/test_switches.h"
+#include "chrome/test/base/testing_profile.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
#include "ui/gl/gl_implementation.h"
diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc
index 8aad164..44730eb 100644
--- a/chrome/test/webdriver/commands/create_session.cc
+++ b/chrome/test/webdriver/commands/create_session.cc
@@ -8,7 +8,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/values.h"
#include "chrome/test/webdriver/commands/response.h"
#include "chrome/test/webdriver/webdriver_error.h"
diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
index 20f6a71..2f7457d 100644
--- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
+++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
@@ -5,7 +5,7 @@
#include "base/base64.h"
#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/values.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/zip.h"
@@ -38,7 +38,7 @@ TEST(CapabilitiesParser, SimpleCaps) {
options->SetBoolean("nativeEvents", true);
Capabilities caps;
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CapabilitiesParser parser(&dict, temp_dir.path(), Logger(), &caps);
ASSERT_FALSE(parser.Parse());
@@ -61,7 +61,7 @@ TEST(CapabilitiesParser, Args) {
options->Set("args", args);
Capabilities caps;
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CapabilitiesParser parser(&dict, temp_dir.path(), Logger(), &caps);
ASSERT_FALSE(parser.Parse());
@@ -81,7 +81,7 @@ TEST(CapabilitiesParser, Extensions) {
options->Set("extensions", extensions);
Capabilities caps;
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CapabilitiesParser parser(&dict, temp_dir.path(), Logger(), &caps);
ASSERT_FALSE(parser.Parse());
@@ -99,7 +99,7 @@ TEST(CapabilitiesParser, Profile) {
DictionaryValue* options = new DictionaryValue();
dict.Set("chromeOptions", options);
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath folder = temp_dir.path().AppendASCII("folder");
ASSERT_TRUE(file_util::CreateDirectory(folder));
diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc
index 690c189..55a37f6 100644
--- a/chrome/test/webdriver/webdriver_session.cc
+++ b/chrome/test/webdriver/webdriver_session.cc
@@ -1839,7 +1839,7 @@ Error* Session::GetScreenShot(std::string* png) {
"The current target does not support screenshot");
}
Error* error = NULL;
- ScopedTempDir screenshots_dir;
+ base::ScopedTempDir screenshots_dir;
if (!screenshots_dir.CreateUniqueTempDir()) {
return new Error(kUnknownError,
"Could not create temp directory for screenshot");
diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h
index 2ca23bc..23395af 100644
--- a/chrome/test/webdriver/webdriver_session.h
+++ b/chrome/test/webdriver/webdriver_session.h
@@ -11,8 +11,8 @@
#include "base/callback_forward.h"
#include "base/file_path.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
#include "base/string16.h"
#include "base/threading/thread.h"
#include "chrome/common/automation_constants.h"
@@ -484,7 +484,7 @@ class Session {
bool has_alert_prompt_text_;
// Temporary directory containing session data.
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
Capabilities capabilities_;
// Current state of all modifier keys.
diff --git a/chrome/test/webdriver/webdriver_util.cc b/chrome/test/webdriver/webdriver_util.cc
index 5a4cd75..2e8a491 100644
--- a/chrome/test/webdriver/webdriver_util.cc
+++ b/chrome/test/webdriver/webdriver_util.cc
@@ -7,16 +7,16 @@
#include "base/base64.h"
#include "base/basictypes.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/format_macros.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/rand_util.h"
-#include "base/scoped_temp_dir.h"
-#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/stringprintf.h"
#include "base/third_party/icu/icu_utf.h"
#include "chrome/common/automation_id.h"
#include "chrome/common/zip.h"
@@ -51,7 +51,7 @@ namespace {
bool UnzipArchive(const FilePath& unzip_dir,
const std::string& bytes,
std::string* error_msg) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
if (!dir.CreateUniqueTempDir()) {
*error_msg = "Unable to create temp dir";
return false;
diff --git a/chrome/test/webdriver/webdriver_util_unittest.cc b/chrome/test/webdriver/webdriver_util_unittest.cc
index 7c82483..e41c647 100644
--- a/chrome/test/webdriver/webdriver_util_unittest.cc
+++ b/chrome/test/webdriver/webdriver_util_unittest.cc
@@ -8,7 +8,7 @@
#include "base/base64.h"
#include "base/file_path.h"
#include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
#include "chrome/test/webdriver/webdriver_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +27,7 @@ TEST(RandomIDTest, CanGenerateSufficientlyRandomIDs) {
}
TEST(ZipFileTest, ZipEntryToZipArchive) {
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
std::string data;
// A zip entry sent from a Java WebDriver client (v2.20) that contains a
generated by cgit v1.1 at 2025-02-10 06:45:35 +0000