Fixing ProfileManagerTest to use the TestingProfile instead of a real profile. This will allow ea...

chrome/test/base/testing_profile_manager.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 "chrome/test/base/testing_profile_manager.h"
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace testing {
 
 class ProfileManager : public ::ProfileManager {
  public:
   explicit ProfileManager(const FilePath& user_data_dir)
       : ::ProfileManager(user_data_dir) {}
 
  protected:
-  virtual Profile* CreateProfile(const FilePath& file_path) {
+  virtual Profile* CreateProfileHelper(const FilePath& file_path) OVERRIDE {
     return new TestingProfile(file_path);
   }
 };
 
 }  // namespace testing
 
 TestingProfileManager::TestingProfileManager(TestingBrowserProcess* process)
     : called_set_up_(false),
       browser_process_(process),
       local_state_(process) {
@@ skipping 71 matching lines @@
       << "ProfileManager already exists";
 
   // Set up the directory for profiles.
   ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
 
   profile_manager_ = new testing::ProfileManager(profiles_dir_.path());
   browser_process_->SetProfileManager(profile_manager_);  // Takes ownership.
 
   called_set_up_ = true;
 }