Revert of Update SplitString calls to new form

ui/views/controls/label.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/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 478 matching lines @@
   focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
   focus_bounds.Intersect(GetLocalBounds());
   return focus_bounds;
 }
 
 std::vector<base::string16> Label::GetLinesForWidth(int width) const {
   std::vector<base::string16> lines;
   // |width| can be 0 when getting the default text size, in that case
   // the ideal lines (i.e. broken at newline characters) are wanted.
   if (width <= 0) {
-    lines = base::SplitString(
-        render_text_->GetDisplayText(), base::string16(1, '\n'),
-        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    base::SplitString(render_text_->GetDisplayText(), '\n', &lines);
   } else {
     gfx::ElideRectangleText(render_text_->GetDisplayText(), font_list(), width,
                             std::numeric_limits<int>::max(),
                             render_text_->word_wrap_behavior(), &lines);
   }
   return lines;
 }
 
 gfx::Size Label::GetTextSize() const {
   gfx::Size size;
@@ skipping 62 matching lines @@
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   const gfx::Size text_size = GetTextSize();
   const gfx::Size size = GetContentsBounds().size();
   return !obscured() && (text_size.width() > size.width() ||
                          (multi_line() && text_size.height() > size.height()));
 }
 
 }  // namespace views