Revert of Replace string::find(prefix) == 0 pattern with base::StartsWith().

chrome/browser/chromeos/profiles/profile_helper.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 "chrome/browser/chromeos/profiles/profile_helper.h"
 
 #include "base/barrier_closure.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/chromeos/base/file_flusher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 111 matching lines @@
     return std::string();
 
   std::string profile_dir = profile->GetPath().BaseName().value();
 
   // Don't strip prefix if the dir is not supposed to be prefixed.
   if (!ShouldAddProfileDirPrefix(profile_dir))
     return profile_dir;
 
   // Check that profile directory starts with the correct prefix.
   std::string prefix(chrome::kProfileDirPrefix);
-  if (!base::StartsWith(profile_dir, prefix, base::CompareCase::SENSITIVE)) {
+  if (profile_dir.find(prefix) != 0) {
     // This happens when creating a TestingProfile in browser tests.
     return std::string();
   }
 
-  return profile_dir.substr(prefix.length());
+  return profile_dir.substr(prefix.length(),
+                            profile_dir.length() - prefix.length());
 }
 
 // static
 base::FilePath ProfileHelper::GetUserProfileDir(
     const std::string& user_id_hash) {
   CHECK(!user_id_hash.empty());
   return ShouldAddProfileDirPrefix(user_id_hash)
              ? base::FilePath(chrome::kProfileDirPrefix + user_id_hash)
              : base::FilePath(user_id_hash);
 }
@@ skipping 332 matching lines @@
       DownloadPrefs::FromBrowserContext(profile)->DownloadPath());
   // Let extension system handle extension files.
   excludes.push_back(base::FilePath(extensions::kInstallDirectoryName));
   // Do not flush Drive cache.
   excludes.push_back(base::FilePath(chromeos::kDriveCacheDirname));
 
   profile_flusher_->RequestFlush(profile->GetPath(), excludes, base::Closure());
 }
 
 }  // namespace chromeos