Minor cleanup:...

chrome/test/ui/sunspider_uitest.cc

 // Copyright (c) 2009 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.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
 namespace {
 
 static const FilePath::CharType kStartFile[] =
     FILE_PATH_LITERAL("sunspider-driver.html");
 
-const wchar_t kRunSunSpiderTest[] = L"run-sunspider-test";
+const wchar_t kRunSunSpider[] = L"run-sunspider";
 
 class SunSpiderTest : public UITest {
  public:
   typedef std::map<std::string, std::string> ResultsMap;
 
   SunSpiderTest() : reference_(false) {
     dom_automation_enabled_ = true;
     show_window_ = true;
   }
 
@@ skipping 98 matching lines @@
     std::string total;
     ASSERT_TRUE(GetTotal(tab, &total));
 
     ResultsMap results;
     ASSERT_TRUE(GetResults(tab, &results));
 
     std::string trace_name = reference_ ? "t_ref" : "t";
 
     PrintResultMeanAndError("total", "", trace_name, total, "ms", true);
 
-    ResultsMap::iterator it = results.begin();
+    ResultsMap::const_iterator it = results.begin();
     for (; it != results.end(); ++it)
       PrintResultList(it->first, "", trace_name, it->second, "ms", false);
   }
 
   DISALLOW_COPY_AND_ASSIGN(SunSpiderTest);
 };
 
 class SunSpiderReferenceTest : public SunSpiderTest {
  public:
   SunSpiderReferenceTest() : SunSpiderTest() {
     reference_ = true;
   }
 
   // Override the browser directory that is used by UITest::SetUp to cause it
   // to use the reference build instead.
   void SetUp() {
     FilePath dir;
     PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
     dir = dir.AppendASCII("reference_build");
     dir = dir.AppendASCII("chrome");
     browser_directory_ = dir.ToWStringHack();
     UITest::SetUp();
   }
 };
 
 }  // namespace
 
 TEST_F(SunSpiderTest, Perf) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpiderTest))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpider))
     return;
 
   RunTest();
 }
 
 TEST_F(SunSpiderReferenceTest, Perf) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpiderTest))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpider))
     return;
 
   RunTest();
 }