Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <urlhist.h>
 #include <shlguid.h>
 #endif
 
 #include <vector>
 
 #include "app/win/scoped_com_initializer.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/password_form.h"
@@ skipping 14 matching lines @@
 
 class ImporterTest : public testing::Test {
  public:
   ImporterTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {}
 
  protected:
   virtual void SetUp() {
     // Creates a new profile in a new subdirectory in the temp directory.
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_path_));
-    test_path_ = test_path_.AppendASCII("ImporterTest");
-    file_util::Delete(test_path_, true);
-    file_util::CreateDirectory(test_path_);
-    profile_path_ = test_path_.AppendASCII("profile");
-    app_path_ = test_path_.AppendASCII("app");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest");
+    file_util::Delete(test_path, true);
+    file_util::CreateDirectory(test_path);
+    profile_path_ = test_path.AppendASCII("profile");
+    app_path_ = test_path.AppendASCII("app");
     file_util::CreateDirectory(app_path_);
   }
 
-  virtual void TearDown() {
-    // Deletes the profile and cleans up the profile directory.
-    ASSERT_TRUE(file_util::Delete(test_path_, true));
-    ASSERT_FALSE(file_util::PathExists(test_path_));
-  }
-
   void Firefox3xImporterTest(std::string profile_dir,
                              importer::ImporterProgressObserver* observer,
                              ProfileWriter* writer,
                              bool import_search_plugins) {
     FilePath data_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII(profile_dir);
     ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true));
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII("firefox3_nss");
@@ skipping 23 matching lines @@
     host->SetObserver(observer);
     int items = importer::HISTORY | importer::PASSWORDS | importer::FAVORITES;
     if (import_search_plugins)
       items = items | importer::SEARCH_ENGINES;
     loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
         &ImporterHost::StartImportSettings, source_profile,
         static_cast<Profile*>(NULL), items, make_scoped_refptr(writer), true));
     loop->Run();
   }
 
+  ScopedTempDir temp_dir_;
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
-  FilePath test_path_;
   FilePath profile_path_;
   FilePath app_path_;
 };
 
 const int kMaxPathSize = 5;
 
 struct BookmarkList {
   const bool in_toolbar;
   const size_t path_size;
   const wchar_t* path[kMaxPathSize];
@@ skipping 192 matching lines @@
     HRESULT res = pstore->WriteItem(0, type, subtype, items[i].name,
         items[i].data_size, reinterpret_cast<BYTE*>(items[i].data),
         NULL, 0, 0);
     ASSERT_TRUE(res == PST_E_OK);
   }
 }
 
 TEST_F(ImporterTest, IEImporter) {
   // Sets up a favorites folder.
   app::win::ScopedCOMInitializer com_init;
-  std::wstring path = test_path_.AppendASCII("Favorites").value();
+  std::wstring path = temp_dir_.path().AppendASCII("Favorites").value();
   CreateDirectory(path.c_str(), NULL);
   CreateDirectory((path + L"\\SubFolder").c_str(), NULL);
   CreateDirectory((path + L"\\Links").c_str(), NULL);
   CreateDirectory((path + L"\\Links\\SubFolderOfLinks").c_str(), NULL);
   CreateDirectory((path + L"\\\x0061").c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path + L"\\Google Home Page.url",
                             L"http://www.google.com/"));
   ASSERT_TRUE(CreateUrlFile(path + L"\\SubFolder\\Title.url",
                             L"http://www.link.com/"));
   ASSERT_TRUE(CreateUrlFile(path + L"\\TheLink.url",
@@ skipping 43 matching lines @@
   ASSERT_TRUE(res == S_OK);
 
   // Starts to import the above settings.
   MessageLoop* loop = MessageLoop::current();
   scoped_refptr<ImporterHost> host(new ImporterHost);
 
   TestObserver* observer = new TestObserver();
   host->SetObserver(observer);
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::MS_IE;
-  source_profile.source_path = test_path_;
+  source_profile.source_path = temp_dir_.path();
 
   loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
       &ImporterHost::StartImportSettings,
       source_profile,
       static_cast<Profile*>(NULL),
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       observer,
       true));
   loop->Run();
 
@@ skipping 470 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer(
       new Firefox3Observer(import_search_engines));
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }