Index: chrome/installer/setup/install_unittest.cc |
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc |
index 4416c80339e5d3c20bd6a88679e122384b777225..9fd7eff9385d9df978ae97c85b505fba6fe2b397 100644 |
--- a/chrome/installer/setup/install_unittest.cc |
+++ b/chrome/installer/setup/install_unittest.cc |
@@ -8,10 +8,10 @@ |
#include "base/file_path.h" |
#include "base/file_util.h" |
+#include "base/files/scoped_temp_dir.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/path_service.h" |
#include "base/platform_file.h" |
-#include "base/scoped_temp_dir.h" |
#include "base/string16.h" |
#include "base/test/scoped_path_override.h" |
#include "base/test/test_shortcut_win.h" |
@@ -53,7 +53,7 @@ class CreateVisualElementsManifestTest : public testing::Test { |
} |
// The temporary directory used to contain the test operations. |
- ScopedTempDir test_dir_; |
+ base::ScopedTempDir test_dir_; |
// A dummy version number used to create the version directory. |
Version version_; |
@@ -185,13 +185,13 @@ class InstallShortcutTest : public testing::Test { |
scoped_ptr<installer::Product> product_; |
scoped_ptr<installer::MasterPreferences> prefs_; |
- ScopedTempDir temp_dir_; |
- ScopedTempDir fake_user_desktop_; |
- ScopedTempDir fake_common_desktop_; |
- ScopedTempDir fake_user_quick_launch_; |
- ScopedTempDir fake_default_user_quick_launch_; |
- ScopedTempDir fake_start_menu_; |
- ScopedTempDir fake_common_start_menu_; |
+ base::ScopedTempDir temp_dir_; |
+ base::ScopedTempDir fake_user_desktop_; |
+ base::ScopedTempDir fake_common_desktop_; |
+ base::ScopedTempDir fake_user_quick_launch_; |
+ base::ScopedTempDir fake_default_user_quick_launch_; |
+ base::ScopedTempDir fake_start_menu_; |
+ base::ScopedTempDir fake_common_start_menu_; |
scoped_ptr<base::ScopedPathOverride> user_desktop_override_; |
scoped_ptr<base::ScopedPathOverride> common_desktop_override_; |
scoped_ptr<base::ScopedPathOverride> user_quick_launch_override_; |