views: Fix progress bar tooltip text function.

ui/views/controls/progress_bar.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 "ui/views/controls/progress_bar.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 const SkColor kBackgroundColorStart = SkColorSetRGB(212, 212, 212);
 const SkColor kBackgroundColorEnd = SkColorSetRGB(252, 252, 252);
 const SkColor kBorderColor = SkColorSetRGB(144, 144, 144);
 
 void AddRoundRectPathWithPadding(int x, int y,
                                  int w, int h,
                                  int corner_radius,
                                  SkScalar padding,
                                  SkPath* path) {
   DCHECK(path);
-  if (path == NULL)
-    return;
   SkRect rect;
   rect.set(
       SkIntToScalar(x) + padding, SkIntToScalar(y) + padding,
       SkIntToScalar(x + w) - padding, SkIntToScalar(y + h) - padding);
   path->addRoundRect(
       rect,
       SkIntToScalar(corner_radius) - padding,
       SkIntToScalar(corner_radius) - padding);
 }
 
@@ skipping 106 matching lines @@
     SchedulePaint();
   }
 }
 
 void ProgressBar::SetTooltipText(const string16& tooltip_text) {
   tooltip_text_ = tooltip_text;
 }
 
 bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   DCHECK(tooltip);
-  if (tooltip == NULL)
-    return false;
-  tooltip->assign(tooltip_text_);
+  *tooltip = tooltip_text_;
   return !tooltip_text_.empty();
 }
 
 void ProgressBar::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PROGRESSBAR;
   state->state = ui::AccessibilityTypes::STATE_READONLY;
 }
 
 gfx::Size ProgressBar::GetPreferredSize() {
   return gfx::Size(100, 16);
@@ skipping 110 matching lines @@
   if (progress_width > 1) {
     FillRoundRect(canvas, 0, 0, progress_width, height(), kCornerRadius,
                   kBarColorStart, kBarColorEnd, false);
   }
   StrokeRoundRect(canvas, 0, 0, width(), height(), kCornerRadius,
                   kBorderColor, kBorderWidth);
 #endif
 }
 
 }  // namespace views