Category group support/Renamings.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2012 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 "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 484 matching lines @@
 
 void UITestBase::AppendBrowserLaunchSwitch(const char* name) {
   launch_arguments_.AppendSwitch(name);
 }
 
 void UITestBase::AppendBrowserLaunchSwitch(const char* name,
                                            const char* value) {
   launch_arguments_.AppendSwitchASCII(name, value);
 }
 
-bool UITestBase::BeginTracing(const std::string& categories) {
-  return automation()->BeginTracing(categories);
+bool UITestBase::BeginTracing(const std::string& category_patterns) {
+  return automation()->BeginTracing(category_patterns);
 }
 
 std::string UITestBase::EndTracing() {
   std::string json_trace_output;
   if (!automation()->EndTracing(&json_trace_output))
     return "";
   return json_trace_output;
 }
 
 // UITest methods
@@ skipping 197 matching lines @@
   ASSERT_TRUE(session_end_completed);
 
   // Make sure session restore says we didn't crash.
   scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences());
   ASSERT_TRUE(profile_prefs.get());
   std::string exit_type;
   ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly,
                                         &exit_type));
   EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type);
 }