Recommit the generate profile patch

chrome/test/ui/ui_test.cc

 // Copyright (c) 2012 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/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 70 matching lines @@
 UITestBase::UITestBase()
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(chrome::kAboutBlankURL),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
-      enable_file_cookies_(true),
-      profile_type_(UITestBase::DEFAULT_THEME) {
+      enable_file_cookies_(true) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
 }
 
 UITestBase::UITestBase(base::MessageLoop::Type msg_loop_type)
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
-      enable_file_cookies_(true),
-      profile_type_(UITestBase::DEFAULT_THEME) {
+      enable_file_cookies_(true) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
 }
 
 UITestBase::~UITestBase() {}
 
 void UITestBase::SetUp() {
   // Tests that do a session restore (e.g. SessionRestoreUITest, StartupTest)
   // call SetUp() multiple times because they restart the browser mid-test.
   // We don't want to reset the ProxyLauncher's state in those cases.
@@ skipping 294 matching lines @@
     EXPECT_TRUE(launcher_->WaitForBrowserProcessToQuit(
         TestTimeouts::action_max_timeout(), &exit_code));
     EXPECT_EQ(0, exit_code);  // Expect a clean shutown.
     // Ensure no child processes are left dangling.
     TerminateAllChromeProcesses(processes);
   }
 
   return result;
 }
 
-// static
-base::FilePath UITestBase::ComputeTypicalUserDataSource(
-    UITestBase::ProfileType profile_type) {
-  base::FilePath source_history_file;
-  EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA,
-                               &source_history_file));
-  source_history_file = source_history_file.AppendASCII("profiles");
-  switch (profile_type) {
-    case UITestBase::DEFAULT_THEME:
-      source_history_file = source_history_file.AppendASCII(
-          "profile_with_default_theme");
-      break;
-    case UITestBase::COMPLEX_THEME:
-      source_history_file = source_history_file.AppendASCII(
-          "profile_with_complex_theme");
-      break;
-    default:
-      NOTREACHED();
-  }
-
-  return source_history_file;
-}
-
 int UITestBase::GetCrashCount() const {
   base::FilePath crash_dump_path;
   PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path);
 
   int files_found = 0;
   file_util::FileEnumerator en(crash_dump_path, false,
                                file_util::FileEnumerator::FILES);
   while (!en.Next().empty()) {
     file_util::FileEnumerator::FindInfo info;
     if (file_util::FileEnumerator::GetLastModifiedTime(info) > test_start_time_)
@@ skipping 260 matching lines @@
   ASSERT_TRUE(session_end_completed);
 
   // Make sure session restore says we didn't crash.
   scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences());
   ASSERT_TRUE(profile_prefs.get());
   std::string exit_type;
   ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly,
                                         &exit_type));
   EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type);
 }