Move EscapeQueryStringValue to drive_api_util.

chrome/browser/google_apis/drive_api_service.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/google_apis/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/drive_api_operations.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
+#include "chrome/browser/google_apis/drive_api_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/operation_runner.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace google_apis {
@@ skipping 164 matching lines @@
     callback.Run(UploadRangeResponse(GDATA_PARSE_ERROR,
                                      response.start_position_received,
                                      response.end_position_received),
                  scoped_ptr<ResourceEntry>());
     return;
   }
 
   callback.Run(response, entry.Pass());
 }
 
-// It is necessary to escape ' to \' in the query's string value.
-// See also: https://developers.google.com/drive/search-parameters
-std::string EscapeQueryStringValue(const std::string& str) {
-  std::string result;
-  ReplaceChars(str, "'", "\\'", &result);
-  return result;
-}
-
 // The resource ID for the root directory for Drive API is defined in the spec:
 // https://developers.google.com/drive/folder
 const char kDriveApiRootDirectoryResourceId[] = "root";
 
 }  // namespace
 
 DriveAPIService::DriveAPIService(
     net::URLRequestContextGetter* url_request_context_getter,
     const GURL& base_url,
     const GURL& wapi_base_url,
@@ skipping 98 matching lines @@
   // code up by moving the resposibility to include "parents" in the query
   // to client side.
   // We aren't interested in files in trash in this context, neither.
   runner_->StartOperationWithRetry(
       new GetFilelistOperation(
           operation_registry(),
           url_request_context_getter_,
           url_generator_,
           base::StringPrintf(
               "'%s' in parents and trashed = false",
-              EscapeQueryStringValue(directory_resource_id).c_str()),
+              drive::util::EscapeQueryStringValue(
+                  directory_resource_id).c_str()),
           base::Bind(&ParseResourceListOnBlockingPoolAndRun, callback)));
 }
 
 void DriveAPIService::Search(const std::string& search_query,
                              const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!search_query.empty());
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
@@ skipping 15 matching lines @@
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new GetFilelistOperation(
           operation_registry(),
           url_request_context_getter_,
           url_generator_,
           base::StringPrintf(
               "%s and '%s' in parents and trashed = false",
               search_query.c_str(),
-              EscapeQueryStringValue(directory_resource_id).c_str()),
+              drive::util::EscapeQueryStringValue(
+                  directory_resource_id).c_str()),
           base::Bind(&ParseResourceListOnBlockingPoolAndRun, callback)));
 }
 
 void DriveAPIService::GetChangeList(int64 start_changestamp,
                                     const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new GetChangelistOperation(
@@ skipping 341 matching lines @@
 }
 
 void DriveAPIService::OnProgressUpdate(
     const OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 }  // namespace google_apis