Split Dromaeo tests per suites.

BUG=37239

Review URL: http://codereview.chromium.org/665007

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

1 files changed, 16 insertions, 16 deletions

diff --git a/chrome/test/ui/dromaeo_benchmark_uitest.cc b/chrome/test/ui/dromaeo_benchmark_uitest.cc
index e1d060e..6031dac 100644
--- a/chrome/test/ui/dromaeo_benchmark_uitest.cc
+++ b/chrome/test/ui/dromaeo_benchmark_uitest.cc
@@ -19,11 +19,6 @@
 
 namespace {
 
-static const FilePath::CharType kStartFile[] =
-    FILE_PATH_LITERAL("index.html?dom|jslib&automated");
-
-const wchar_t kRunDromaeo[] = L"run-dromaeo-benchmark";
-
 class DromaeoTest : public UITest {
  public:
   typedef std::map<std::string, std::string> ResultsMap;
@@ -33,10 +28,12 @@ class DromaeoTest : public UITest {
     show_window_ = true;
   }
 
-  void RunTest() {
-    FilePath::StringType start_file(kStartFile);
+  void RunTest(const FilePath::CharType* suite) {
     FilePath test_path = GetDromaeoDir();
-    test_path = test_path.Append(start_file);
+    test_path = test_path.Append(
+        FilePath::StringType(FILE_PATH_LITERAL("index.html?")) +
+        FilePath::StringType(suite) +
+        FilePath::StringType(FILE_PATH_LITERAL("&automated")));
     GURL test_url(net::FilePathToFileURL(test_path));
 
     scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -144,18 +141,21 @@ class DromaeoReferenceTest : public DromaeoTest {
   }
 };
 
-TEST_F(DromaeoTest, Perf) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
-    return;
+TEST_F(DromaeoTest, DOMCorePerf) {
+  RunTest(FILE_PATH_LITERAL("dom"));
+}
 
-  RunTest();
+TEST_F(DromaeoTest, JSLibPerf) {
+  RunTest(FILE_PATH_LITERAL("jslib"));
 }
 
-TEST_F(DromaeoReferenceTest, Perf) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
-    return;
+TEST_F(DromaeoReferenceTest, DOMCorePerf) {
+  RunTest(FILE_PATH_LITERAL("dom"));
+}
 
-  RunTest();
+TEST_F(DromaeoReferenceTest, JSLibPerf) {
+  RunTest(FILE_PATH_LITERAL("jslib"));
 }
 
+
 }  // namespace