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

chrome/browser/chromeos/drive/file_system_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/chromeos/drive/file_system_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 #include "net/base/escape.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace util {
 
 namespace {
 
-const base::FilePath::CharType kSpecialMountPointRoot[] =
-    FILE_PATH_LITERAL("/special");
-
-const char kDriveMountPointNameBase[] = "drive";
-
-const base::FilePath::CharType kDriveMyDriveRootPath[] =
-    FILE_PATH_LITERAL("drive/root");
-
-const base::FilePath::CharType kFileCacheVersionDir[] =
-    FILE_PATH_LITERAL("v1");
-
-const char kSlash[] = "/";
-const char kDot = '.';
-const char kEscapedChars[] = "_";
-
 std::string ReadStringFromGDocFile(const base::FilePath& file_path,
                                    const std::string& key) {
   const int64 kMaxGDocSize = 4096;
   int64 file_size = 0;
   if (!base::GetFileSize(file_path, &file_size) ||
       file_size > kMaxGDocSize) {
     LOG(WARNING) << "File too large to be a GDoc file " << file_path.value();
     return std::string();
   }
 
@@ skipping 40 matching lines @@
 }  // namespace
 
 const base::FilePath& GetDriveGrandRootPath() {
   CR_DEFINE_STATIC_LOCAL(base::FilePath, grand_root_path,
       (kDriveGrandRootDirName));
   return grand_root_path;
 }
 
 const base::FilePath& GetDriveMyDriveRootPath() {
   CR_DEFINE_STATIC_LOCAL(base::FilePath, drive_root_path,
-      (kDriveMyDriveRootPath));
+                         (FILE_PATH_LITERAL("drive/root")));
   return drive_root_path;
 }
 
 base::FilePath GetDriveMountPointPathForUserIdHash(
     const std::string user_id_hash) {
+  static const base::FilePath::CharType kSpecialMountPointRoot[] =
+      FILE_PATH_LITERAL("/special");
+  static const char kDriveMountPointNameBase[] = "drive";
   return base::FilePath(kSpecialMountPointRoot).AppendASCII(
       net::EscapePath(kDriveMountPointNameBase +
                       (user_id_hash.empty() ? "" : "-" + user_id_hash)));
 }
 
 base::FilePath GetDriveMountPointPath(Profile* profile) {
   std::string id = chromeos::ProfileHelper::GetUserIdHashFromProfile(profile);
   if (id.empty() || id == chrome::kLegacyProfileDir) {
     // ProfileHelper::GetUserIdHashFromProfile works only when multi-profile is
     // enabled. In that case, we fall back to use UserManager (it basically just
@@ skipping 118 matching lines @@
   if (!url.is_valid() || url.type() != fileapi::kFileSystemTypeDrive)
     return base::FilePath();
   return ExtractDrivePath(url.path());
 }
 
 base::FilePath GetCacheRootPath(Profile* profile) {
   base::FilePath cache_base_path;
   chrome::GetUserCacheDirectory(profile->GetPath(), &cache_base_path);
   base::FilePath cache_root_path =
       cache_base_path.Append(chromeos::kDriveCacheDirname);
+  static const base::FilePath::CharType kFileCacheVersionDir[] =
+      FILE_PATH_LITERAL("v1");
   return cache_root_path.Append(kFileCacheVersionDir);
 }
 
 std::string EscapeCacheFileName(const std::string& filename) {
   // This is based on net/base/escape.cc: net::(anonymous namespace)::Escape
   std::string escaped;
   for (size_t i = 0; i < filename.size(); ++i) {
     char c = filename[i];
     if (c == '%' || c == '.' || c == '/') {
       base::StringAppendF(&escaped, "%%%02X", c);
@@ skipping 17 matching lines @@
   }
   return unescaped;
 }
 
 std::string NormalizeFileName(const std::string& input) {
   DCHECK(base::IsStringUTF8(input));
 
   std::string output;
   if (!base::ConvertToUtf8AndNormalize(input, base::kCodepageUTF8, &output))
     output = input;
-  base::ReplaceChars(output, kSlash, std::string(kEscapedChars), &output);
-  if (!output.empty() && output.find_first_not_of(kDot, 0) == std::string::npos)
-    output = kEscapedChars;
+  base::ReplaceChars(output, "/", "_", &output);
+  if (!output.empty() && output.find_first_not_of('.', 0) == std::string::npos)
+    output = "_";
   return output;
 }
 
 void PrepareWritableFileAndRun(Profile* profile,
                                const base::FilePath& path,
                                const PrepareWritableFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   FileSystemInterface* file_system = GetFileSystemByProfile(profile);
@@ skipping 100 matching lines @@
   const bool disable_sync_over_celluar =
       profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular);
 
   if (is_connection_cellular && disable_sync_over_celluar)
     return DRIVE_CONNECTED_METERED;
   return DRIVE_CONNECTED;
 }
 
 }  // namespace util
 }  // namespace drive