summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/drive/directory_loader.cc46
-rw-r--r--chrome/browser/chromeos/drive/directory_loader.h3
-rw-r--r--chrome/browser/chromeos/drive/directory_loader_unittest.cc1
-rw-r--r--chrome/browser/chromeos/drive/file_system.cc1
-rw-r--r--chrome/browser/chromeos/drive/job_list.cc6
-rw-r--r--chrome/browser/chromeos/drive/job_list.h2
-rw-r--r--chrome/browser/chromeos/drive/job_scheduler.cc41
-rw-r--r--chrome/browser/chromeos/drive/job_scheduler.h12
-rw-r--r--chrome/browser/drive/drive_api_service.cc35
-rw-r--r--chrome/browser/drive/drive_api_service.h6
-rw-r--r--chrome/browser/drive/drive_service_interface.h21
-rw-r--r--chrome/browser/drive/dummy_drive_service.cc8
-rw-r--r--chrome/browser/drive/dummy_drive_service.h6
-rw-r--r--chrome/browser/drive/fake_drive_service.cc100
-rw-r--r--chrome/browser/drive/fake_drive_service.h6
15 files changed, 43 insertions, 251 deletions
diff --git a/chrome/browser/chromeos/drive/directory_loader.cc b/chrome/browser/chromeos/drive/directory_loader.cc
index 0b4ab8c..6ef149a 100644
--- a/chrome/browser/chromeos/drive/directory_loader.cc
+++ b/chrome/browser/chromeos/drive/directory_loader.cc
@@ -15,8 +15,6 @@
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/job_scheduler.h"
#include "chrome/browser/chromeos/drive/resource_metadata.h"
-#include "chrome/browser/drive/drive_api_util.h"
-#include "chrome/browser/drive/drive_service_interface.h"
#include "chrome/browser/drive/event_logger.h"
#include "content/public/browser/browser_thread.h"
#include "google_apis/drive/drive_api_parser.h"
@@ -122,20 +120,8 @@ class DirectoryLoader::FeedFetcher {
// Remember the time stamp for usage stats.
start_time_ = base::TimeTicks::Now();
- // We use WAPI's GetResourceListInDirectory even if Drive API v2 is
- // enabled. This is the short term work around of the performance
- // regression.
- // TODO(hashimoto): Remove this. crbug.com/340931.
-
- std::string resource_id = directory_fetch_info_.resource_id();
- if (resource_id == root_folder_id_) {
- // GData WAPI doesn't accept the root directory id which is used in Drive
- // API v2. So it is necessary to translate it here.
- resource_id = util::kWapiRootDirectoryResourceId;
- }
-
- loader_->scheduler_->GetResourceListInDirectoryByWapi(
- resource_id,
+ loader_->scheduler_->GetResourceListInDirectory(
+ directory_fetch_info_.resource_id(),
base::Bind(&FeedFetcher::OnResourceListFetched,
weak_ptr_factory_.GetWeakPtr(), callback));
}
@@ -156,7 +142,6 @@ class DirectoryLoader::FeedFetcher {
DCHECK(resource_list);
scoped_ptr<ChangeList> change_list(new ChangeList(*resource_list));
- FixResourceIdInChangeList(change_list.get());
GURL next_url;
resource_list->GetNextFeedURL(&next_url);
@@ -197,7 +182,7 @@ class DirectoryLoader::FeedFetcher {
if (!next_url.is_empty()) {
// There is the remaining result so fetch it.
- loader_->scheduler_->GetRemainingResourceList(
+ loader_->scheduler_->GetRemainingFileList(
next_url,
base::Bind(&FeedFetcher::OnResourceListFetched,
weak_ptr_factory_.GetWeakPtr(), callback));
@@ -213,29 +198,6 @@ class DirectoryLoader::FeedFetcher {
callback.Run(FILE_ERROR_OK);
}
- // Fixes resource IDs in |change_list| into the format that |drive_service_|
- // can understand. Note that |change_list| contains IDs in GData WAPI format
- // since currently we always use WAPI for fast fetch, regardless of the flag.
- void FixResourceIdInChangeList(ChangeList* change_list) {
- std::vector<ResourceEntry>* entries = change_list->mutable_entries();
- std::vector<std::string>* parent_resource_ids =
- change_list->mutable_parent_resource_ids();
- for (size_t i = 0; i < entries->size(); ++i) {
- ResourceEntry* entry = &(*entries)[i];
- if (entry->has_resource_id())
- entry->set_resource_id(FixResourceId(entry->resource_id()));
-
- (*parent_resource_ids)[i] = FixResourceId((*parent_resource_ids)[i]);
- }
- }
-
- std::string FixResourceId(const std::string& resource_id) {
- if (resource_id == util::kWapiRootDirectoryResourceId)
- return root_folder_id_;
- return loader_->drive_service_->GetResourceIdCanonicalizer().Run(
- resource_id);
- }
-
DirectoryLoader* loader_;
DirectoryFetchInfo directory_fetch_info_;
std::string root_folder_id_;
@@ -249,14 +211,12 @@ DirectoryLoader::DirectoryLoader(
base::SequencedTaskRunner* blocking_task_runner,
ResourceMetadata* resource_metadata,
JobScheduler* scheduler,
- DriveServiceInterface* drive_service,
AboutResourceLoader* about_resource_loader,
LoaderController* loader_controller)
: logger_(logger),
blocking_task_runner_(blocking_task_runner),
resource_metadata_(resource_metadata),
scheduler_(scheduler),
- drive_service_(drive_service),
about_resource_loader_(about_resource_loader),
loader_controller_(loader_controller),
weak_ptr_factory_(this) {
diff --git a/chrome/browser/chromeos/drive/directory_loader.h b/chrome/browser/chromeos/drive/directory_loader.h
index 4318ded..a3e9f36 100644
--- a/chrome/browser/chromeos/drive/directory_loader.h
+++ b/chrome/browser/chromeos/drive/directory_loader.h
@@ -30,7 +30,6 @@ class AboutResource;
namespace drive {
-class DriveServiceInterface;
class EventLogger;
class JobScheduler;
class ResourceEntry;
@@ -51,7 +50,6 @@ class DirectoryLoader {
base::SequencedTaskRunner* blocking_task_runner,
ResourceMetadata* resource_metadata,
JobScheduler* scheduler,
- DriveServiceInterface* drive_service,
AboutResourceLoader* about_resource_loader,
LoaderController* apply_task_controller);
~DirectoryLoader();
@@ -126,7 +124,6 @@ class DirectoryLoader {
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
ResourceMetadata* resource_metadata_; // Not owned.
JobScheduler* scheduler_; // Not owned.
- DriveServiceInterface* drive_service_; // Not owned.
AboutResourceLoader* about_resource_loader_; // Not owned.
LoaderController* loader_controller_; // Not owned.
ObserverList<ChangeListLoaderObserver> observers_;
diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc
index bb93d4b..e1d1bc6 100644
--- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc
+++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc
@@ -116,7 +116,6 @@ class DirectoryLoaderTest : public testing::Test {
base::MessageLoopProxy::current().get(),
metadata_.get(),
scheduler_.get(),
- drive_service_.get(),
about_resource_loader_.get(),
loader_controller_.get()));
}
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index 4e67ffa..59fb5f1 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -332,7 +332,6 @@ void FileSystem::ResetComponents() {
blocking_task_runner_.get(),
resource_metadata_,
scheduler_,
- drive_service_,
about_resource_loader_.get(),
loader_controller_.get()));
directory_loader_->AddObserver(this);
diff --git a/chrome/browser/chromeos/drive/job_list.cc b/chrome/browser/chromeos/drive/job_list.cc
index 8b940c5..b2182eb 100644
--- a/chrome/browser/chromeos/drive/job_list.cc
+++ b/chrome/browser/chromeos/drive/job_list.cc
@@ -54,10 +54,6 @@ std::string JobTypeToString(JobType type) {
return "TYPE_UPLOAD_EXISTING_FILE";
case TYPE_CREATE_FILE:
return "TYPE_CREATE_FILE";
- case TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI:
- return "TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI";
- case TYPE_GET_REMAINING_RESOURCE_LIST:
- return "TYPE_GET_REMAINING_RESOURCE_LIST";
case TYPE_ADD_PERMISSION:
return "TYPE_ADD_PERMISSION";
}
@@ -133,8 +129,6 @@ bool IsActiveFileTransferJobInfo(const JobInfo& job_info) {
case TYPE_REMOVE_RESOURCE_FROM_DIRECTORY:
case TYPE_ADD_NEW_DIRECTORY:
case TYPE_CREATE_FILE:
- case TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI:
- case TYPE_GET_REMAINING_RESOURCE_LIST:
case TYPE_ADD_PERMISSION:
return false;
case TYPE_DOWNLOAD_FILE:
diff --git a/chrome/browser/chromeos/drive/job_list.h b/chrome/browser/chromeos/drive/job_list.h
index 0d15449..4401243 100644
--- a/chrome/browser/chromeos/drive/job_list.h
+++ b/chrome/browser/chromeos/drive/job_list.h
@@ -36,8 +36,6 @@ enum JobType {
TYPE_UPLOAD_NEW_FILE,
TYPE_UPLOAD_EXISTING_FILE,
TYPE_CREATE_FILE,
- TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI,
- TYPE_GET_REMAINING_RESOURCE_LIST,
TYPE_ADD_PERMISSION,
};
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index ee8479a..615178e 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -695,45 +695,6 @@ void JobScheduler::UploadExistingFile(
StartJob(new_job);
}
-void JobScheduler::GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!callback.is_null());
-
- JobEntry* new_job = CreateNewJob(
- TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI);
- new_job->task = base::Bind(
- &DriveServiceInterface::GetResourceListInDirectoryByWapi,
- base::Unretained(drive_service_),
- directory_resource_id,
- base::Bind(&JobScheduler::OnGetResourceListJobDone,
- weak_ptr_factory_.GetWeakPtr(),
- new_job->job_info.job_id,
- callback));
- new_job->abort_callback = CreateErrorRunCallback(callback);
- StartJob(new_job);
-}
-
-void JobScheduler::GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!callback.is_null());
-
- JobEntry* new_job = CreateNewJob(TYPE_GET_REMAINING_RESOURCE_LIST);
- new_job->task = base::Bind(
- &DriveServiceInterface::GetRemainingResourceList,
- base::Unretained(drive_service_),
- next_link,
- base::Bind(&JobScheduler::OnGetResourceListJobDone,
- weak_ptr_factory_.GetWeakPtr(),
- new_job->job_info.job_id,
- callback));
- new_job->abort_callback = CreateErrorRunCallback(callback);
- StartJob(new_job);
-}
-
void JobScheduler::AddPermission(
const std::string& resource_id,
const std::string& email,
@@ -1121,8 +1082,6 @@ JobScheduler::QueueType JobScheduler::GetJobQueueType(JobType type) {
case TYPE_REMOVE_RESOURCE_FROM_DIRECTORY:
case TYPE_ADD_NEW_DIRECTORY:
case TYPE_CREATE_FILE:
- case TYPE_GET_RESOURCE_LIST_IN_DIRECTORY_BY_WAPI:
- case TYPE_GET_REMAINING_RESOURCE_LIST:
case TYPE_ADD_PERMISSION:
return METADATA_QUEUE;
diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h
index 416e66d..1078287 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.h
+++ b/chrome/browser/chromeos/drive/job_scheduler.h
@@ -207,18 +207,6 @@ class JobScheduler
const ClientContext& context,
const google_apis::GetResourceEntryCallback& callback);
- // Adds a GetResourceListInDirectoryByWapi operation to the queue.
- // |callback| must not be null.
- void GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback);
-
- // Adds GetRemainingResourceList operation to the queue.
- // |callback| must not be null.
- void GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback);
-
// Adds AddPermission operation to the queue. |callback| must not be null.
void AddPermission(const std::string& resource_id,
const std::string& email,
diff --git a/chrome/browser/drive/drive_api_service.cc b/chrome/browser/drive/drive_api_service.cc
index cf81889..dd464d5 100644
--- a/chrome/browser/drive/drive_api_service.cc
+++ b/chrome/browser/drive/drive_api_service.cc
@@ -43,7 +43,6 @@ using google_apis::GetContentCallback;
using google_apis::GetResourceEntryCallback;
using google_apis::GetResourceEntryRequest;
using google_apis::GetResourceListCallback;
-using google_apis::GetResourceListRequest;
using google_apis::GetShareUrlCallback;
using google_apis::HTTP_NOT_IMPLEMENTED;
using google_apis::HTTP_SUCCESS;
@@ -833,40 +832,6 @@ CancelCallback DriveAPIService::UninstallApp(
return sender_->StartRequestWithRetry(request);
}
-CancelCallback DriveAPIService::GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!directory_resource_id.empty());
- DCHECK(!callback.is_null());
-
- return sender_->StartRequestWithRetry(
- new GetResourceListRequest(sender_.get(),
- wapi_url_generator_,
- GURL(), // No override url
- 0, // start changestamp
- std::string(), // empty search query
- directory_resource_id,
- callback));
-}
-
-CancelCallback DriveAPIService::GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!next_link.is_empty());
- DCHECK(!callback.is_null());
-
- return sender_->StartRequestWithRetry(
- new GetResourceListRequest(sender_.get(),
- wapi_url_generator_,
- next_link,
- 0, // start changestamp
- std::string(), // empty search query
- std::string(), // no directory resource id
- callback));
-}
-
google_apis::CancelCallback DriveAPIService::AddPermission(
const std::string& resource_id,
const std::string& email,
diff --git a/chrome/browser/drive/drive_api_service.h b/chrome/browser/drive/drive_api_service.h
index 90a580a..a43fe05 100644
--- a/chrome/browser/drive/drive_api_service.h
+++ b/chrome/browser/drive/drive_api_service.h
@@ -182,12 +182,6 @@ class DriveAPIService : public DriveServiceInterface,
virtual google_apis::CancelCallback UninstallApp(
const std::string& app_id,
const google_apis::EntryActionCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
virtual google_apis::CancelCallback AddPermission(
const std::string& resource_id,
const std::string& email,
diff --git a/chrome/browser/drive/drive_service_interface.h b/chrome/browser/drive/drive_service_interface.h
index 151f308..1b393d6 100644
--- a/chrome/browser/drive/drive_service_interface.h
+++ b/chrome/browser/drive/drive_service_interface.h
@@ -414,27 +414,6 @@ class DriveServiceInterface {
const std::string& app_id,
const google_apis::EntryActionCallback& callback) = 0;
- // This is introduced as a temporary short term solution of the performance
- // regression issue on Drive API v2.
- //
- // This fetches the resource list in a directory by using GData WAPI
- // regardless of base protocol. In other words, even if we enables Drive API
- // v2, this method uses GData WAPI to fetch the resource list.
- //
- // |directory_resource_id| must not be empty.
- // |callback| must not be null.
- virtual google_apis::CancelCallback GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) = 0;
-
- // GetResourceListInDirectoryByWapi can be paged. This method fetches the
- // following pages.
- //
- // |callback| must not be null.
- virtual google_apis::CancelCallback GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) = 0;
-
// Authorizes the account |email| to access |resource_id| as a |role|.
//
// |callback| must not be null.
diff --git a/chrome/browser/drive/dummy_drive_service.cc b/chrome/browser/drive/dummy_drive_service.cc
index 17c13cd..1528c15 100644
--- a/chrome/browser/drive/dummy_drive_service.cc
+++ b/chrome/browser/drive/dummy_drive_service.cc
@@ -192,14 +192,6 @@ CancelCallback DummyDriveService::UninstallApp(
const std::string& app_id,
const EntryActionCallback& callback) { return CancelCallback(); }
-CancelCallback DummyDriveService::GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const GetResourceListCallback& callback) { return CancelCallback(); }
-
-CancelCallback DummyDriveService::GetRemainingResourceList(
- const GURL& next_link,
- const GetResourceListCallback& callback) { return CancelCallback(); }
-
CancelCallback DummyDriveService::AddPermission(
const std::string& resource_id,
const std::string& email,
diff --git a/chrome/browser/drive/dummy_drive_service.h b/chrome/browser/drive/dummy_drive_service.h
index 0dfce74..ce6ee94 100644
--- a/chrome/browser/drive/dummy_drive_service.h
+++ b/chrome/browser/drive/dummy_drive_service.h
@@ -138,12 +138,6 @@ class DummyDriveService : public DriveServiceInterface {
virtual google_apis::CancelCallback UninstallApp(
const std::string& app_id,
const google_apis::EntryActionCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
virtual google_apis::CancelCallback AddPermission(
const std::string& resource_id,
const std::string& email,
diff --git a/chrome/browser/drive/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc
index 3931727..4605911 100644
--- a/chrome/browser/drive/fake_drive_service.cc
+++ b/chrome/browser/drive/fake_drive_service.cc
@@ -426,7 +426,45 @@ CancelCallback FakeDriveService::GetRemainingChangeList(
DCHECK(!next_link.is_empty());
DCHECK(!callback.is_null());
- return GetRemainingResourceList(next_link, callback);
+ // "changestamp", "q", "parent" and "start-offset" are parameters to
+ // implement "paging" of the result on FakeDriveService.
+ // The URL should be the one filled in GetResourceListInternal of the
+ // previous method invocation, so it should start with "http://localhost/?".
+ // See also GetResourceListInternal.
+ DCHECK_EQ(next_link.host(), "localhost");
+ DCHECK_EQ(next_link.path(), "/");
+
+ int64 start_changestamp = 0;
+ std::string search_query;
+ std::string directory_resource_id;
+ int start_offset = 0;
+ int max_results = default_max_results_;
+ std::vector<std::pair<std::string, std::string> > parameters;
+ if (base::SplitStringIntoKeyValuePairs(
+ next_link.query(), '=', '&', &parameters)) {
+ for (size_t i = 0; i < parameters.size(); ++i) {
+ if (parameters[i].first == "changestamp") {
+ base::StringToInt64(parameters[i].second, &start_changestamp);
+ } else if (parameters[i].first == "q") {
+ search_query =
+ net::UnescapeURLComponent(parameters[i].second,
+ net::UnescapeRule::URL_SPECIAL_CHARS);
+ } else if (parameters[i].first == "parent") {
+ directory_resource_id =
+ net::UnescapeURLComponent(parameters[i].second,
+ net::UnescapeRule::URL_SPECIAL_CHARS);
+ } else if (parameters[i].first == "start-offset") {
+ base::StringToInt(parameters[i].second, &start_offset);
+ } else if (parameters[i].first == "max-results") {
+ base::StringToInt(parameters[i].second, &max_results);
+ }
+ }
+ }
+
+ GetResourceListInternal(
+ start_changestamp, search_query, directory_resource_id,
+ start_offset, max_results, NULL, callback);
+ return CancelCallback();
}
CancelCallback FakeDriveService::GetRemainingFileList(
@@ -436,7 +474,7 @@ CancelCallback FakeDriveService::GetRemainingFileList(
DCHECK(!next_link.is_empty());
DCHECK(!callback.is_null());
- return GetRemainingResourceList(next_link, callback);
+ return GetRemainingChangeList(next_link, callback);
}
CancelCallback FakeDriveService::GetResourceEntry(
@@ -1195,64 +1233,6 @@ CancelCallback FakeDriveService::UninstallApp(
return CancelCallback();
}
-CancelCallback FakeDriveService::GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) {
- return GetResourceListInDirectory(
- directory_resource_id == util::kWapiRootDirectoryResourceId ?
- GetRootResourceId() :
- directory_resource_id,
- callback);
-}
-
-CancelCallback FakeDriveService::GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!next_link.is_empty());
- DCHECK(!callback.is_null());
-
- // "changestamp", "q", "parent" and "start-offset" are parameters to
- // implement "paging" of the result on FakeDriveService.
- // The URL should be the one filled in GetResourceListInternal of the
- // previous method invocation, so it should start with "http://localhost/?".
- // See also GetResourceListInternal.
- DCHECK_EQ(next_link.host(), "localhost");
- DCHECK_EQ(next_link.path(), "/");
-
- int64 start_changestamp = 0;
- std::string search_query;
- std::string directory_resource_id;
- int start_offset = 0;
- int max_results = default_max_results_;
- std::vector<std::pair<std::string, std::string> > parameters;
- if (base::SplitStringIntoKeyValuePairs(
- next_link.query(), '=', '&', &parameters)) {
- for (size_t i = 0; i < parameters.size(); ++i) {
- if (parameters[i].first == "changestamp") {
- base::StringToInt64(parameters[i].second, &start_changestamp);
- } else if (parameters[i].first == "q") {
- search_query =
- net::UnescapeURLComponent(parameters[i].second,
- net::UnescapeRule::URL_SPECIAL_CHARS);
- } else if (parameters[i].first == "parent") {
- directory_resource_id =
- net::UnescapeURLComponent(parameters[i].second,
- net::UnescapeRule::URL_SPECIAL_CHARS);
- } else if (parameters[i].first == "start-offset") {
- base::StringToInt(parameters[i].second, &start_offset);
- } else if (parameters[i].first == "max-results") {
- base::StringToInt(parameters[i].second, &max_results);
- }
- }
- }
-
- GetResourceListInternal(
- start_changestamp, search_query, directory_resource_id,
- start_offset, max_results, NULL, callback);
- return CancelCallback();
-}
-
void FakeDriveService::AddNewFile(const std::string& content_type,
const std::string& content_data,
const std::string& parent_resource_id,
diff --git a/chrome/browser/drive/fake_drive_service.h b/chrome/browser/drive/fake_drive_service.h
index f852fd6..b38a1f3 100644
--- a/chrome/browser/drive/fake_drive_service.h
+++ b/chrome/browser/drive/fake_drive_service.h
@@ -232,12 +232,6 @@ class FakeDriveService : public DriveServiceInterface {
virtual google_apis::CancelCallback UninstallApp(
const std::string& app_id,
const google_apis::EntryActionCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetResourceListInDirectoryByWapi(
- const std::string& directory_resource_id,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
- virtual google_apis::CancelCallback GetRemainingResourceList(
- const GURL& next_link,
- const google_apis::GetResourceListCallback& callback) OVERRIDE;
virtual google_apis::CancelCallback AddPermission(
const std::string& resource_id,
const std::string& email,
generated by cgit v1.1 at 2025-02-14 00:53:55 +0000