Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/drive/drive_api_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/drive/drive_api_util.h"
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "net/base/escape.h"
 #include "third_party/re2/re2/re2.h"
 #include "url/gurl.h"
 
 namespace drive {
 namespace util {
 namespace {
 
-// Returns the argument string.
-std::string Identity(const std::string& resource_id) { return resource_id; }
-
 struct HostedDocumentKind {
   const char* mime_type;
   const char* extension;
 };
 
 const HostedDocumentKind kHostedDocumentKinds[] = {
     {kGoogleDocumentMimeType,     ".gdoc"},
     {kGoogleSpreadsheetMimeType,  ".gsheet"},
     {kGooglePresentationMimeType, ".gslides"},
     {kGoogleDrawingMimeType,      ".gdraw"},
@@ skipping 91 matching lines @@
 std::string CanonicalizeResourceId(const std::string& resource_id) {
   // If resource ID is in the old WAPI format starting with a prefix like
   // "document:", strip it and return the remaining part.
   std::string stripped_resource_id;
   if (RE2::FullMatch(resource_id, "^[a-z-]+(?::|%3A)([\\w-]+)$",
                      &stripped_resource_id))
     return stripped_resource_id;
   return resource_id;
 }
 
-ResourceIdCanonicalizer GetIdentityResourceIdCanonicalizer() {
-  return base::Bind(&Identity);
-}
-
 const char kDocsListScope[] = "https://docs.google.com/feeds/";
 const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
 
 void ParseShareUrlAndRun(const google_apis::GetShareUrlCallback& callback,
                          google_apis::GDataErrorCode error,
                          scoped_ptr<base::Value> value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (!value) {
     callback.Run(error, GURL());
@@ skipping 207 matching lines @@
   const std::string extension = base::FilePath(path.Extension()).AsUTF8Unsafe();
   for (size_t i = 0; i < arraysize(kHostedDocumentKinds); ++i) {
     if (extension == kHostedDocumentKinds[i].extension)
       return true;
   }
   return extension == kUnknownHostedDocumentExtension;
 }
 
 }  // namespace util
 }  // namespace drive