Revert of Update SplitString calls to new form

ash/test/display_manager_test_api.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 "ash/test/display_manager_test_api.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
@@ skipping 16 matching lines @@
 typedef std::vector<gfx::Display> DisplayList;
 typedef DisplayInfo DisplayInfo;
 typedef std::vector<DisplayInfo> DisplayInfoList;
 
 namespace {
 
 std::vector<DisplayInfo> CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
   std::vector<DisplayInfo> display_info_list;
-  std::vector<std::string> parts = base::SplitString(
-      specs, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> parts;
+  base::SplitString(specs, ',', &parts);
   size_t index = 0;
 
   DisplayManager::DisplayList list =
       display_manager->IsInUnifiedMode()
           ? display_manager->software_mirroring_display_list()
           : display_manager->active_display_list();
 
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter, ++index) {
     int64 id = (index < list.size()) ? list[index].id()
@@ skipping 110 matching lines @@
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
   if (!GetDisplayModeForResolution(info, resolution, &mode))
     return false;
   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 }  // namespace test
 }  // namespace ash