Now with unit test fixes. [Try 2 with fixes for unit tests.]

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
TBR=pkotwicz,brettw
First Review URL: https://chromiumcodereview.appspot.com/10698009

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

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

1 files changed, 6 insertions, 12 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 624fdfb..ead766d 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,17 @@ 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();
   }
+
   return source_history_file;
 }