Make various string_util functions take StringPieces instead of char[].

chrome/browser/ui/omnibox/location_bar_util.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/browser/ui/omnibox/location_bar_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/text_elider.h"
 
 namespace location_bar_util {
 
 base::string16 CalculateMinString(const base::string16& description) {
   // Chop at the first '.' or whitespace.
-  const size_t dot_index = description.find('.');
-  const size_t ws_index = description.find_first_of(base::kWhitespaceUTF16);
-  size_t chop_index = std::min(dot_index, ws_index);
-  base::string16 min_string;
-  if (chop_index == base::string16::npos) {
-    // No dot or whitespace, truncate to at most 3 chars.
-    min_string = gfx::TruncateString(description, 3);
-  } else {
-    min_string = description.substr(0, chop_index);
-  }
+  const size_t chop_index = description.find_first_of(
+      base::kWhitespaceUTF16 + base::ASCIIToUTF16("."));
+  base::string16 min_string((chop_index == base::string16::npos) ?
+      gfx::TruncateString(description, 3) : description.substr(0, chop_index));
   base::i18n::AdjustStringForLocaleDirection(&min_string);
   return min_string;
 }
 
 }  // namespace location_bar_util