Make TestingProfile use ScopedTempDir.

chrome/test/testing_profile.h

 // 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.
 
 #ifndef CHROME_TEST_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 24 matching lines @@
 class SessionService;
 class TemplateURLModel;
 class TestingPrefService;
 class URLRequestContextGetter;
 class WebKitContext;
 
 class TestingProfile : public Profile {
  public:
   TestingProfile();
 
-  // Creates a new profile by adding |count| to the end of the path. Use this
-  // when you need to have more than one TestingProfile running at the same
-  // time.
-  explicit TestingProfile(int count);
-
-  // Creates a new profile specifying the target directory.
-  // Use this as a temporary solution for tests requiring a ScopedTempDir.
-  // This directory must already exist.
-  // TODO(chron): Use a ScopedTempDir. Remove constructor. BUG=51833
-  explicit TestingProfile(const FilePath& directory);
-
   virtual ~TestingProfile();
 
   // Creates the favicon service. Consequent calls would recreate the service.
   void CreateFaviconService();
 
   // Creates the history service. If |delete_file| is true, the history file is
   // deleted first, then the HistoryService is created. As TestingProfile
   // deletes the directory containing the files used by HistoryService, this
   // only matters if you're recreating the HistoryService.  If |no_db| is true,
   // the history backend will fail to initialize its database; this is useful
@@ skipping 30 matching lines @@
   // Uses a specific theme provider for this profile. TestingProfile takes
   // ownership of |theme_provider|.
   void UseThemeProvider(BrowserThemeProvider* theme_provider);
 
   TestingPrefService* GetTestingPrefService();
 
   virtual ProfileId GetRuntimeId() {
     return reinterpret_cast<ProfileId>(this);
   }
 
-  virtual FilePath GetPath() {
-    return path_;
-  }
+  virtual FilePath GetPath();
+
   // Sets whether we're off the record. Default is false.
   void set_off_the_record(bool off_the_record) {
     off_the_record_ = off_the_record;
   }
   virtual bool IsOffTheRecord() { return off_the_record_; }
   virtual Profile* GetOffTheRecordProfile() { return NULL; }
 
   virtual void DestroyOffTheRecordProfile() {}
 
   virtual bool HasOffTheRecordProfile() { return false; }
@@ skipping 135 matching lines @@
   // task is processed.  This has the effect of blocking the caller until the
   // history service processes all pending requests.
   void BlockUntilHistoryProcessesPendingRequests();
 
   // Creates and initializes a profile sync service if the tests require one.
   virtual TokenService* GetTokenService();
   virtual ProfileSyncService* GetProfileSyncService();
   virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; }
 
  protected:
-  // The path of the profile; the various database and other files are relative
-  // to this.
-  FilePath path_;
   base::Time start_time_;
   scoped_ptr<TestingPrefService> prefs_;
 
  private:
   // Destroys favicon service if it has been created.
   void DestroyFaviconService();
 
   // If the history service has been created, it is destroyed. This is invoked
   // from the destructor.
   void DestroyHistoryService();
@@ skipping 63 matching lines @@
   scoped_refptr<GeolocationContentSettingsMap>
       geolocation_content_settings_map_;
   scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
   scoped_ptr<DesktopNotificationService> desktop_notification_service_;
 
   // Find bar state.  Created lazily by GetFindBarState().
   scoped_ptr<FindBarState> find_bar_state_;
 
   FilePath last_selected_directory_;
   scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
+
+  // We use a temporary directory to store testing profile data.
   ScopedTempDir temp_dir_;
 };
 
 // A profile that derives from another profile.  This does not actually
 // override anything except the GetRuntimeId() in order to test sharing of
 // site information.
 class DerivedTestingProfile : public TestingProfile {
  public:
   explicit DerivedTestingProfile(Profile* profile)
       : original_profile_(profile) {}
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();
   }
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_