summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 20:34:23 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 20:34:23 +0000
commitea1a3f60aa4527939af680eda25c7697901f643c (patch)
tree6835e11842b4ff04ec277a5f961cbf1853b95bae /chrome/browser/importer
parenta628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff)
downloadchromium_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/browser/importer')
-rw-r--r--chrome/browser/importer/firefox_importer_utils_unittest.cc4
-rw-r--r--chrome/browser/importer/firefox_profile_lock_unittest.cc4
-rw-r--r--chrome/browser/importer/importer_unittest_utils.h4
-rw-r--r--chrome/browser/importer/safari_importer_unittest.mm4
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/importer/firefox_importer_utils_unittest.cc b/chrome/browser/importer/firefox_importer_utils_unittest.cc
index 8f79908..914a4b7 100644
--- a/chrome/browser/importer/firefox_importer_utils_unittest.cc
+++ b/chrome/browser/importer/firefox_importer_utils_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
#include "chrome/browser/importer/firefox_importer_utils.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -100,7 +100,7 @@ TEST(FirefoxImporterUtilsTest, GetPrefsJsValue) {
}
TEST(FirefoxImporterUtilsTest, GetFirefoxImporterName) {
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
const FilePath app_ini_file(temp_dir.path().AppendASCII("application.ini"));
for (size_t i = 0; i < arraysize(GetFirefoxImporterNameCases); ++i) {
diff --git a/chrome/browser/importer/firefox_profile_lock_unittest.cc b/chrome/browser/importer/firefox_profile_lock_unittest.cc
index 7524aa5..a9a2257 100644
--- a/chrome/browser/importer/firefox_profile_lock_unittest.cc
+++ b/chrome/browser/importer/firefox_profile_lock_unittest.cc
@@ -3,9 +3,9 @@
// found in the LICENSE file.
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
#include "build/build_config.h"
#include "chrome/browser/importer/firefox_profile_lock.h"
@@ -18,7 +18,7 @@ class FirefoxProfileLockTest : public testing::Test {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
};
TEST_F(FirefoxProfileLockTest, LockTest) {
diff --git a/chrome/browser/importer/importer_unittest_utils.h b/chrome/browser/importer/importer_unittest_utils.h
index a809c5a..3b054a8 100644
--- a/chrome/browser/importer/importer_unittest_utils.h
+++ b/chrome/browser/importer/importer_unittest_utils.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_UNITTEST_UTILS_H_
#define CHROME_BROWSER_IMPORTER_IMPORTER_UNITTEST_UTILS_H_
+#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/scoped_temp_dir.h"
#include "chrome/browser/importer/profile_writer.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -46,7 +46,7 @@ class ImporterTest : public testing::Test {
protected:
virtual void SetUp() OVERRIDE;
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
scoped_ptr<TestingProfile> profile_;
private:
diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm
index 9515859..ff29c6d 100644
--- a/chrome/browser/importer/safari_importer_unittest.mm
+++ b/chrome/browser/importer/safari_importer_unittest.mm
@@ -7,8 +7,8 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
#include "base/string16.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
@@ -193,7 +193,7 @@ TEST_F(SafariImporterTest, CanImport) {
EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
// Check that we don't import anything from a bogus library directory.
- ScopedTempDir fake_library_dir;
+ base::ScopedTempDir fake_library_dir;
ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir.path(), &items));
}