Replace some Tokenize calls with SplitString.

ash/display/display_info.cc

 // Copyright (c) 2013 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 <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/win/dpi.h"
 #endif
@@ skipping 100 matching lines @@
   const int kDefaultHostWindowX = 200;
   const int kDefaultHostWindowY = 200;
   const int kDefaultHostWindowWidth = 1366;
   const int kDefaultHostWindowHeight = 768;
   gfx::Rect bounds_in_native(kDefaultHostWindowX, kDefaultHostWindowY,
                              kDefaultHostWindowWidth, kDefaultHostWindowHeight);
 #endif
   std::string main_spec = spec;
 
   float ui_scale = 1.0f;
-  std::vector<std::string> parts;
-  if (Tokenize(main_spec, "@", &parts) == 2) {
+  std::vector<std::string> parts = base::SplitString(
+      main_spec, "@", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  if (parts.size() == 2) {
     double scale_in_double = 0;
     if (base::StringToDouble(parts[1], &scale_in_double))
       ui_scale = scale_in_double;
     main_spec = parts[0];
   }
 
-  size_t count = Tokenize(main_spec, "/", &parts);
+  parts = base::SplitString(main_spec, "/", base::KEEP_WHITESPACE,
+                            base::SPLIT_WANT_NONEMPTY);
   gfx::Display::Rotation rotation(gfx::Display::ROTATE_0);
   bool has_overscan = false;
-  if (count) {
+  if (!parts.empty()) {
     main_spec = parts[0];
-    if (count >= 2) {
+    if (parts.size() >= 2) {
       std::string options = parts[1];
       for (size_t i = 0; i < options.size(); ++i) {
         char c = options[i];
         switch (c) {
           case 'o':
             has_overscan = true;
             break;
           case 'r':  // rotate 90 degrees to 'right'.
             rotation = gfx::Display::ROTATE_90;
             break;
           case 'u':  // 180 degrees, 'u'pside-down.
             rotation = gfx::Display::ROTATE_180;
             break;
           case 'l':  // rotate 90 degrees to 'left'.
             rotation = gfx::Display::ROTATE_270;
             break;
         }
       }
     }
   }
 
   float device_scale_factor = 1.0f;
   if (!GetDisplayBounds(main_spec, &bounds_in_native, &device_scale_factor)) {
 #if defined(OS_WIN)
     device_scale_factor = gfx::GetDPIScale();
 #endif
   }
 
   std::vector<DisplayMode> display_modes;
-  if (Tokenize(main_spec, "#", &parts) == 2) {
+  parts = base::SplitString(main_spec, "#", base::KEEP_WHITESPACE,
+                            base::SPLIT_WANT_NONEMPTY);
+  if (parts.size() == 2) {
     size_t native_mode = 0;
     int largest_area = -1;
     float highest_refresh_rate = -1.0f;
     main_spec = parts[0];
     std::string resolution_list = parts[1];
-    count = Tokenize(resolution_list, "|", &parts);
-    for (size_t i = 0; i < count; ++i) {
+    parts = base::SplitString(resolution_list, "|", base::KEEP_WHITESPACE,
+                              base::SPLIT_WANT_NONEMPTY);
+    for (size_t i = 0; i < parts.size(); ++i) {
       DisplayMode mode;
       gfx::Rect mode_bounds;
-      std::vector<std::string> resolution;
-      Tokenize(parts[i], "%", &resolution);
+      std::vector<std::string> resolution = base::SplitString(
+          parts[i], "%", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
       if (GetDisplayBounds(
               resolution[0], &mode_bounds, &mode.device_scale_factor)) {
         mode.size = mode_bounds.size();
         if (resolution.size() > 1)
           sscanf(resolution[1].c_str(), "%f", &mode.refresh_rate);
         if (mode.size.GetArea() >= largest_area &&
             mode.refresh_rate > highest_refresh_rate) {
           // Use mode with largest area and highest refresh rate as native.
           largest_area = mode.size.GetArea();
           highest_refresh_rate = mode.refresh_rate;
@@ skipping 224 matching lines @@
   return std::find(available_color_profiles_.begin(),
                    available_color_profiles_.end(),
                    profile) != available_color_profiles_.end();
 }
 
 bool DisplayInfo::Use125DSFRorUIScaling() const {
   return use_125_dsf_for_ui_scaling && id_ == gfx::Display::InternalDisplayId();
 }
 
 }  // namespace ash