Make history easily filterable.

We're renaming the two profile directories that we want to keep, and dropping
GTK specific tests in anticipation of the changeover later this year.

Every change to the history, theme or profile format required a new giant
binary file added to our repository. There are tens of versions of the history
database alone, each weighing at over 10 megabytes. In the proposed pruned git
repository, these are the largest files.

This standardizes both remaining test profile directories on the same set of
binaries (they're currently out of sync), and moves them to new path names so
we can purge the previous paths from history.

BUG=111570
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10698009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153933 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 8 insertions, 106 deletions

diff --git a/chrome/test/data/profiles/complex_theme/Default/History b/chrome/test/data/profiles/complex_theme/Default/History
deleted file mode 100644
index 98481ce..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/History
+++ /dev/null
diff --git a/chrome/test/data/profiles/complex_theme/Default/Thumbnails b/chrome/test/data/profiles/complex_theme/Default/Thumbnails
deleted file mode 100644
index fc26118..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Thumbnails
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame/Default/Preferences b/chrome/test/data/profiles/custom_frame/Default/Preferences
deleted file mode 100644
index d9929da..0000000
--- a/chrome/test/data/profiles/custom_frame/Default/Preferences
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-   "extensions": {
-      "theme": {
-          "use_system": false
-      }
-   },
-   "browser": {
-      "custom_chrome_frame": true
-   },
-   "profile": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "Not Signed In",
-      "nickname": "not-signed-in"
-   },
-   "spellcheck": {
-      "dictionary": "en-US"
-   }
-}
diff --git a/chrome/test/data/profiles/custom_frame/Default/Thumbnails b/chrome/test/data/profiles/custom_frame/Default/Thumbnails
deleted file mode 100644
index fc26118..0000000
--- a/chrome/test/data/profiles/custom_frame/Default/Thumbnails
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies
deleted file mode 100644
index 60cac09..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Cookies
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index
deleted file mode 100644
index 65ea2f6..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Full Text Index
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History
deleted file mode 100644
index 98481ce..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/History
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences
deleted file mode 100644
index c1cad69..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Preferences
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-   "browser": {
-      "custom_chrome_frame": true
-   },
-   "extensions": {
-      "theme": {
-          "use_system": true
-      }
-   },
-   "profile": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "Not Signed In",
-      "nickname": "not-signed-in"
-   },
-   "spellcheck": {
-      "dictionary": "en-US"
-   }
-}
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails
deleted file mode 100644
index fc26118..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Thumbnails
+++ /dev/null
diff --git a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links b/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links
deleted file mode 100644
index 2fa35a9..0000000
--- a/chrome/test/data/profiles/custom_frame_gtk_theme/Default/Visited Links
+++ /dev/null
diff --git a/chrome/test/data/profiles/gtk_theme/Default/Cookies b/chrome/test/data/profiles/gtk_theme/Default/Cookies
deleted file mode 100644
index 60cac09..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/Cookies
+++ /dev/null
diff --git a/chrome/test/data/profiles/gtk_theme/Default/Full Text Index b/chrome/test/data/profiles/gtk_theme/Default/Full Text Index
deleted file mode 100644
index 65ea2f6..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/Full Text Index
+++ /dev/null
diff --git a/chrome/test/data/profiles/gtk_theme/Default/History b/chrome/test/data/profiles/gtk_theme/Default/History
deleted file mode 100644
index 98481ce..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/History
+++ /dev/null
diff --git a/chrome/test/data/profiles/gtk_theme/Default/Preferences b/chrome/test/data/profiles/gtk_theme/Default/Preferences
deleted file mode 100644
index e2e79aa..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/Preferences
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-   "extensions": {
-      "theme": {
-          "use_system": true
-      }
-   },
-   "profile": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "Not Signed In",
-      "nickname": "not-signed-in"
-   },
-   "spellcheck": {
-      "dictionary": "en-US"
-   }
-}
diff --git a/chrome/test/data/profiles/gtk_theme/Default/Thumbnails b/chrome/test/data/profiles/gtk_theme/Default/Thumbnails
deleted file mode 100644
index fc26118..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/Thumbnails
+++ /dev/null
diff --git a/chrome/test/data/profiles/gtk_theme/Default/Visited Links b/chrome/test/data/profiles/gtk_theme/Default/Visited Links
deleted file mode 100644
index 2fa35a9..0000000
--- a/chrome/test/data/profiles/gtk_theme/Default/Visited Links
+++ /dev/null
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cookies b/chrome/test/data/profiles/profile_with_complex_theme/Default/Cookies
index 60cac09..60cac09 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Cookies
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Cookies
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
index 67ea5c6..67ea5c6 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUY_c8CDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUY_c8CDA
index 4168b92..4168b92 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUY_c8CDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUY_c8CDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA
index 7065537..7065537 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYjNgCDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYjNgCDA
index 93755c7..93755c7 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYjNgCDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYjNgCDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA
index 51fedf8..51fedf8 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYw8gCDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYw8gCDA
index e2e9fdd..e2e9fdd 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYw8gCDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYw8gCDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA
index 9f4dcc6..9f4dcc6 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/manifest.json b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/manifest.json
index 07a9755..07a9755 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/manifest.json
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/manifest.json
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/Current Version b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/Current Version
index b123147..b123147 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/Current Version
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/Current Version
diff --git a/chrome/test/data/profiles/complex_theme/Default/Full Text Index b/chrome/test/data/profiles/profile_with_complex_theme/Default/Full Text Index
index 65ea2f6..65ea2f6 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Full Text Index
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Full Text Index
diff --git a/chrome/test/data/profiles/typical_history/Default/History b/chrome/test/data/profiles/profile_with_complex_theme/Default/History
index 163d5ff..163d5ff 100644
--- a/chrome/test/data/profiles/typical_history/Default/History
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/History
diff --git a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate b/chrome/test/data/profiles/profile_with_complex_theme/Default/PreferencesTemplate
index 7c3eb03..7c3eb03 100644
--- a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/PreferencesTemplate
diff --git a/chrome/test/data/profiles/complex_theme/Default/Visited Links b/chrome/test/data/profiles/profile_with_complex_theme/Default/Visited Links
index 2fa35a9..2fa35a9 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Visited Links
+++ b/chrome/test/data/profiles/profile_with_complex_theme/Default/Visited Links
diff --git a/chrome/test/data/profiles/custom_frame/Default/Cookies b/chrome/test/data/profiles/profile_with_default_theme/Default/Cookies
index 60cac09..60cac09 100644
--- a/chrome/test/data/profiles/custom_frame/Default/Cookies
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Cookies
diff --git a/chrome/test/data/profiles/typical_history/Default/Favicons b/chrome/test/data/profiles/profile_with_default_theme/Default/Favicons
index 716aea0..716aea0 100644
--- a/chrome/test/data/profiles/typical_history/Default/Favicons
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Favicons
diff --git a/chrome/test/data/profiles/custom_frame/Default/Full Text Index b/chrome/test/data/profiles/profile_with_default_theme/Default/Full Text Index
index 65ea2f6..65ea2f6 100644
--- a/chrome/test/data/profiles/custom_frame/Default/Full Text Index
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Full Text Index
diff --git a/chrome/test/data/profiles/custom_frame/Default/History b/chrome/test/data/profiles/profile_with_default_theme/Default/History
index 98481ce..163d5ff 100644
--- a/chrome/test/data/profiles/custom_frame/Default/History
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/History
diff --git a/chrome/test/data/profiles/typical_history/Default/Preferences b/chrome/test/data/profiles/profile_with_default_theme/Default/Preferences
index a924d9c..a924d9c 100644
--- a/chrome/test/data/profiles/typical_history/Default/Preferences
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Preferences
diff --git a/chrome/test/data/profiles/typical_history/Default/Top Sites b/chrome/test/data/profiles/profile_with_default_theme/Default/Top Sites
index 13c7a53..13c7a53 100644
--- a/chrome/test/data/profiles/typical_history/Default/Top Sites
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Top Sites
diff --git a/chrome/test/data/profiles/custom_frame/Default/Visited Links b/chrome/test/data/profiles/profile_with_default_theme/Default/Visited Links
index 2fa35a9..2fa35a9 100644
--- a/chrome/test/data/profiles/custom_frame/Default/Visited Links
+++ b/chrome/test/data/profiles/profile_with_default_theme/Default/Visited Links
diff --git a/chrome/test/data/profiles/typical_history/README.txt b/chrome/test/data/profiles/profile_with_default_theme/README.txt
index a73e0d60..a73e0d60 100644
--- a/chrome/test/data/profiles/typical_history/README.txt
+++ b/chrome/test/data/profiles/profile_with_default_theme/README.txt
diff --git a/chrome/test/data/profiles/typical_history/Default/Cookies b/chrome/test/data/profiles/typical_history/Default/Cookies
deleted file mode 100644
index 60cac09..0000000
--- a/chrome/test/data/profiles/typical_history/Default/Cookies
+++ /dev/null
diff --git a/chrome/test/data/profiles/typical_history/Default/Full Text Index b/chrome/test/data/profiles/typical_history/Default/Full Text Index
deleted file mode 100644
index 65ea2f6..0000000
--- a/chrome/test/data/profiles/typical_history/Default/Full Text Index
+++ /dev/null
diff --git a/chrome/test/data/profiles/typical_history/Default/Visited Links b/chrome/test/data/profiles/typical_history/Default/Visited Links
deleted file mode 100644
index 2fa35a9..0000000
--- a/chrome/test/data/profiles/typical_history/Default/Visited Links
+++ /dev/null
diff --git a/chrome/test/perf/feature_startup_test.cc b/chrome/test/perf/feature_startup_test.cc
index 0e6130a..564dbfe 100644
--- a/chrome/test/perf/feature_startup_test.cc
+++ b/chrome/test/perf/feature_startup_test.cc
@@ -196,24 +196,4 @@ TEST_F(NewTabUIStartupTest, DISABLED_NewTabTimingTestsCold) {
   RunNewTabTimingTest();
 }
 
-#if defined(TOOLKIT_GTK)
-TEST_F(NewTabUIStartupTest, GtkThemeCold) {
-  RunStartupTest("tab_gtk_theme_cold", false /* cold */,
-                 false /* not important */,
-                 UITestBase::NATIVE_THEME);
-}
-
-TEST_F(NewTabUIStartupTest, NativeFrameCold) {
-  RunStartupTest("tab_custom_frame_cold", false /* cold */,
-                 false /* not important */,
-                 UITestBase::CUSTOM_FRAME);
-}
-
-TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) {
-  RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */,
-                 false /* not important */,
-                 UITestBase::CUSTOM_FRAME_NATIVE_THEME);
-}
-#endif
-
 }  // namespace
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index a7e8166..c31bd91 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -468,21 +468,4 @@ TEST_F(StartupTest, ProfilingScript1) {
                  UITestBase::DEFAULT_THEME, 1, 0);
 }
 
-#if defined(TOOLKIT_GTK)
-TEST_F(StartupTest, PerfGtkTheme) {
-  RunStartupTest("warm", "gtk-theme", WARM, NOT_IMPORTANT,
-                 UITestBase::NATIVE_THEME, 0, 0);
-}
-
-TEST_F(StartupTest, PrefNativeFrame) {
-  RunStartupTest("warm", "custom-frame", WARM, NOT_IMPORTANT,
-                 UITestBase::CUSTOM_FRAME, 0, 0);
-}
-
-TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
-  RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
-                 UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
-}
-#endif
-
 }  // namespace
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 624fdfb..55cdc56 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -19,6 +19,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ -419,24 +420,19 @@ FilePath UITestBase::ComputeTypicalUserDataSource(
   source_history_file = source_history_file.AppendASCII("profiles");
   switch (profile_type) {
     case UITestBase::DEFAULT_THEME:
-      source_history_file = source_history_file.AppendASCII("typical_history");
+      source_history_file = source_history_file.AppendASCII(
+          "profile_with_default_theme");
       break;
     case UITestBase::COMPLEX_THEME:
-      source_history_file = source_history_file.AppendASCII("complex_theme");
-      break;
-    case UITestBase::NATIVE_THEME:
-      source_history_file = source_history_file.AppendASCII("gtk_theme");
-      break;
-    case UITestBase::CUSTOM_FRAME:
-      source_history_file = source_history_file.AppendASCII("custom_frame");
-      break;
-    case UITestBase::CUSTOM_FRAME_NATIVE_THEME:
-      source_history_file =
-          source_history_file.AppendASCII("custom_frame_gtk_theme");
+      source_history_file = source_history_file.AppendASCII(
+          "profile_with_complex_theme");
       break;
     default:
       NOTREACHED();
   }
+
+  DCHECK(file_util::PathExists(source_history_file));
+
   return source_history_file;
 }
 
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 23d4cac..98c75fe 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -49,9 +49,6 @@ class UITestBase {
   enum ProfileType {
     DEFAULT_THEME = 0,
     COMPLEX_THEME = 1,
-    NATIVE_THEME = 2,
-    CUSTOM_FRAME = 3,
-    CUSTOM_FRAME_NATIVE_THEME = 4,
   };
 
   // ********* Utility functions *********