6 files changed, 14 insertions, 14 deletions
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