Merge 245212 "Added UMA metrics for ChromeOS first-run UI."

chrome/browser/chromeos/first_run/steps/help_step.cc

Index: chrome/browser/chromeos/first_run/steps/help_step.cc
diff --git a/chrome/browser/chromeos/first_run/steps/help_step.cc b/chrome/browser/chromeos/first_run/steps/help_step.cc
index b65d4934aedc7a54859664f3bcb9f36edf99d8df..5dcfeaaff626fea7f5cd79e26a9d1db9a3112afe 100644
--- a/chrome/browser/chromeos/first_run/steps/help_step.cc
+++ b/chrome/browser/chromeos/first_run/steps/help_step.cc
@@ -22,7 +22,7 @@ HelpStep::HelpStep(ash::FirstRunHelper* shell_helper, FirstRunActor* actor)
     : Step(kHelpStep, shell_helper, actor) {
 }
 
-void HelpStep::Show() {
+void HelpStep::DoShow() {
   if (!shell_helper()->IsTrayBubbleOpened())
     shell_helper()->OpenTrayBubble();
   gfx::Rect button_bounds = shell_helper()->GetHelpButtonBounds();
@@ -31,7 +31,7 @@ void HelpStep::Show() {
   actor()->ShowStepPointingTo(name(), center.x(), center.y(), kCircleRadius);
 }
 
-void HelpStep::OnAfterHide() {
+void HelpStep::DoOnAfterHide() {
   shell_helper()->CloseTrayBubble();
 }