Recommit the generate profile patch

chrome/test/ui/ui_test.h

 // 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.
 
 #ifndef CHROME_TEST_UI_UI_TEST_H_
 #define CHROME_TEST_UI_UI_TEST_H_
 
 // This file provides a common base for running UI unit tests, which operate
 // the entire browser application in a separate process for holistic
 // functional testing.
@@ skipping 27 matching lines @@
 class FilePath;
 }
 
 // Base class for UI Tests. This implements the core of the functions.
 // This base class decouples all automation functionality from testing
 // infrastructure, for use without gtest.
 // If using gtest, you probably want to inherit from UITest (declared below)
 // rather than UITestBase.
 class UITestBase {
  public:
-  // Profile theme type choices.
-  enum ProfileType {
-    DEFAULT_THEME = 0,
-    COMPLEX_THEME = 1,
-  };
-
   // ********* Utility functions *********
 
   // Launches the browser only.
   void LaunchBrowser();
 
   // Launches the browser and IPC testing connection in server mode.
   void LaunchBrowserAndServer();
 
   // Launches the IPC testing connection in client mode,
   // which then attempts to connect to a browser.
@@ skipping 77 matching lines @@
   // Closes the specified browser.  Returns true if the browser was closed.
   // This call is blocking.  |application_closed| is set to true if this was
   // the last browser window (and therefore as a result of it closing the
   // browser process terminated).  Note that in that case this method returns
   // after the browser process has terminated.
   bool CloseBrowser(BrowserProxy* browser, bool* application_closed) const;
 
   // Gets the executable file path of the Chrome browser process.
   const base::FilePath::CharType* GetExecutablePath();
 
-  // Returns the directory name where the "typical" user data is that we use
-  // for testing.
-  static base::FilePath ComputeTypicalUserDataSource(ProfileType profile_type);
-
   // Return the user data directory being used by the browser instance in
   // UITest::SetUp().
   base::FilePath user_data_dir() const {
     return launcher_->user_data_dir();
   }
 
   // Called by some tests that wish to have a base profile to start from. This
   // "user data directory" (containing one or more profiles) will be recursively
   // copied into the user data directory for the test and the files will be
   // evicted from the OS cache. To start with a blank profile, supply an empty
@@ skipping 156 matching lines @@
   // Should we supply the testing channel id
   // on the command line? Default is true.
   bool include_testing_id_;
 
   // Enable file cookies, default is true.
   bool enable_file_cookies_;
 
   // Launches browser and AutomationProxy.
   scoped_ptr<ProxyLauncher> launcher_;
 
-  // Are we using a profile with a complex theme?
-  ProfileType profile_type_;
-
   // PID file for websocket server.
   base::FilePath websocket_pid_file_;
 
  private:
   // Time the test was started (so we can check for new crash dumps)
   base::Time test_start_time_;
 };
 
 class UITest : public UITestBase, public PlatformTest {
  protected:
@@ skipping 85 matching lines @@
 #ifdef UNIT_TEST
 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
 
 template<typename T>
 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
   return out << ptr.get();
 }
 #endif  // UNIT_TEST
 
 #endif  // CHROME_TEST_UI_UI_TEST_H_