Make TestingProfile use ScopedTempDir.

chrome/test/testing_profile.cc

 // Copyright (c) 2010 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 "chrome/test/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 152 matching lines @@
 };
 
 }  // namespace
 
 TestingProfile::TestingProfile()
     : start_time_(Time::Now()),
       created_theme_provider_(false),
       has_history_service_(false),
       off_the_record_(false),
       last_session_exited_cleanly_(true) {
-  PathService::Get(base::DIR_TEMP, &path_);
-  path_ = path_.Append(FILE_PATH_LITERAL("TestingProfilePath"));
-  file_util::Delete(path_, true);
-  file_util::CreateDirectory(path_);
-}
+  if (!temp_dir_.CreateUniqueTempDir()) {
+    LOG(ERROR) << "Failed to create unique temporary directory.";
 
-TestingProfile::TestingProfile(int count)
-    : start_time_(Time::Now()),
-      created_theme_provider_(false),
-      has_history_service_(false),
-      off_the_record_(false),
-      last_session_exited_cleanly_(true) {
-  PathService::Get(base::DIR_TEMP, &path_);
-  path_ = path_.Append(FILE_PATH_LITERAL("TestingProfilePath"));
-  path_ = path_.AppendASCII(base::IntToString(count));
-  file_util::Delete(path_, true);
-  file_util::CreateDirectory(path_);
-}
+    // Fallback logic in case we fail to create unique temporary directory.
+    FilePath system_tmp_dir;
+    bool success = PathService::Get(base::DIR_TEMP, &system_tmp_dir);
 
-TestingProfile::TestingProfile(const FilePath& path)
-    : start_time_(Time::Now()),
-      created_theme_provider_(false),
-      has_history_service_(false),
-      off_the_record_(false),
-      last_session_exited_cleanly_(true) {
-  path_ = path;
+    // We're severly screwed if we can't get the system temporary
+    // directory. Die now to avoid writing to the filesystem root
+    // or other bad places.
+    CHECK(success);
+
+    FilePath fallback_dir(system_tmp_dir.AppendASCII("TestingProfilePath"));
+    file_util::Delete(fallback_dir, true);
+    file_util::CreateDirectory(fallback_dir);
+    if (!temp_dir_.Set(fallback_dir)) {
+      // That shouldn't happen, but if it does, try to recover.
+      LOG(ERROR) << "Failed to use a fallback temporary directory.";
+
+      // We're screwed if this fails, see CHECK above.
+      CHECK(temp_dir_.Set(system_tmp_dir));
+    }
+  }
 }
 
 TestingProfile::~TestingProfile() {
   NotificationService::current()->Notify(
       NotificationType::PROFILE_DESTROYED,
       Source<Profile>(this),
       NotificationService::NoDetails());
   DestroyHistoryService();
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
   DestroyWebDataService();
   if (top_sites_.get())
     top_sites_->ClearProfile();
   history::TopSites::DeleteTopSites(top_sites_);
-
-  file_util::Delete(path_, true);
 }
 
 void TestingProfile::CreateFaviconService() {
   favicon_service_ = NULL;
   favicon_service_ = new FaviconService(this);
 }
 
 void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
   if (history_service_.get())
     history_service_->Cleanup();
@@ skipping 88 matching lines @@
 void TestingProfile::CreateTemplateURLModel() {
   template_url_model_.reset(new TemplateURLModel(this));
 }
 
 void TestingProfile::UseThemeProvider(BrowserThemeProvider* theme_provider) {
   theme_provider->Init(this);
   created_theme_provider_ = true;
   theme_provider_.reset(theme_provider);
 }
 
+FilePath TestingProfile::GetPath() {
+  DCHECK(temp_dir_.IsValid());  // TODO(phajdan.jr): do it better.
+  return temp_dir_.path();
+}
+
 TestingPrefService* TestingProfile::GetTestingPrefService() {
   return static_cast<TestingPrefService*>(GetPrefs());
 }
 
 webkit_database::DatabaseTracker* TestingProfile::GetDatabaseTracker() {
   if (!db_tracker_)
     db_tracker_ = new webkit_database::DatabaseTracker(GetPath(), false);
   return db_tracker_;
 }
 
@@ skipping 20 matching lines @@
     prefs_.reset(new TestingPrefService());
     Profile::RegisterUserPrefs(prefs_.get());
     browser::RegisterAllPrefs(prefs_.get(), prefs_.get());
   }
   return prefs_.get();
 }
 
 history::TopSites* TestingProfile::GetTopSites() {
   if (!top_sites_.get()) {
     top_sites_ = new history::TopSites(this);
-    if (!temp_dir_.CreateUniqueTempDir())
-      return NULL;
     FilePath file_name = temp_dir_.path().AppendASCII("TopSites.db");
     top_sites_->Init(file_name);
   }
   return top_sites_;
 }
 
 URLRequestContextGetter* TestingProfile::GetRequestContext() {
   return request_context_.get();
 }
 
@@ skipping 89 matching lines @@
   }
   return profile_sync_service_.get();
 }
 
 void TestingProfile::DestroyWebDataService() {
   if (!web_data_service_.get())
     return;
 
   web_data_service_->Shutdown();
 }