Fold bulk-optimize-baselines into optimize-baselines

https://bugs.webkit.org/show_bug.cgi?id=66345

Reviewed by James Robinson.

bulk-optimize-baselines is now a superset of optimize-baselines, so
they can be combined.

* Scripts/webkitpy/tool/commands/rebaseline.py:


git-svn-id: svn://svn.chromium.org/blink/trunk@93173 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Tools/ChangeLog

+2011-08-16  Adam Barth  <abarth@webkit.org>
+
+        Fold bulk-optimize-baselines into optimize-baselines
+        https://bugs.webkit.org/show_bug.cgi?id=66345
+
+        Reviewed by James Robinson.
+
+        bulk-optimize-baselines is now a superset of optimize-baselines, so
+        they can be combined.
+
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+
 2011-08-16  Adam Barth  <abarth@webkit.org>
 
         Move chromium-mac to chromium-cg-mac to prepare for Skia switchover

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -105,7 +105,7 @@ class RebaselineTest(AbstractDeclarativeCommand):
 class OptimizeBaselines(AbstractDeclarativeCommand):
     name = "optimize-baselines"
     help_text = "Reshuffles the baselines for the given test to use as litte space on disk as possible."
-    argument_names = "TEST_NAME"
+    argument_names = "TEST_NAMES"
 
     def _optimize_baseline(self, test_name):
         for suffix in _baseline_suffix_list:
@@ -113,19 +113,6 @@ class OptimizeBaselines(AbstractDeclarativeCommand):
             if not self._baseline_optimizer.optimize(baseline_name):
                 print "Hueristics failed to optimize %s" % baseline_name
 
-    def execute(self, options, args, tool):
-        self._baseline_optimizer = BaselineOptimizer(tool.scm(), tool.filesystem)
-        self._optimize_baseline(args[0])
-
-
-class BulkOptimizeBaselines(OptimizeBaselines):
-    name = "bulk-optimize-baselines"
-    help_text = """Reshuffles the baselines for tests to use as litte space on disk as possible."""
-    argument_names = "TEST_NAMES"
-
-    def _to_test_name(self, file_name):
-        return self._tool.filesystem.relpath(file_name, self._port.layout_tests_dir())
-
     def execute(self, options, args, tool):
         self._baseline_optimizer = BaselineOptimizer(tool.scm(), tool.filesystem)
         self._port = factory.get("chromium-win-win7")  # FIXME: This should be selectable.