| Index: chrome/browser/google_apis/gdata_wapi_service.cc
|
| diff --git a/chrome/browser/google_apis/gdata_wapi_service.cc b/chrome/browser/google_apis/gdata_wapi_service.cc
|
| index 7aa8b54e46a49635f184e614b6cd3ddb1449f860..ee604b6987484d58c2ddf8b839579e7f7f760f0d 100644
|
| --- a/chrome/browser/google_apis/gdata_wapi_service.cc
|
| +++ b/chrome/browser/google_apis/gdata_wapi_service.cc
|
| @@ -105,32 +105,6 @@ void ParseResourceEntryAndRun(const GetResourceEntryCallback& callback,
|
| callback.Run(error, entry.Pass());
|
| }
|
|
|
| -// Extracts the open link url from the JSON Feed. Used by AuthorizeApp().
|
| -void ExtractOpenLinkAndRun(const std::string app_id,
|
| - const AuthorizeAppCallback& callback,
|
| - GDataErrorCode error,
|
| - scoped_ptr<ResourceEntry> entry) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| -
|
| - // Entry not found in the feed.
|
| - if (!entry) {
|
| - callback.Run(error, GURL());
|
| - return;
|
| - }
|
| -
|
| - const ScopedVector<google_apis::Link>& resource_links = entry->links();
|
| - GURL open_link;
|
| - for (size_t i = 0; i < resource_links.size(); ++i) {
|
| - if (resource_links[i]->type() == google_apis::Link::LINK_OPEN_WITH &&
|
| - resource_links[i]->app_id() == app_id) {
|
| - open_link = resource_links[i]->href();
|
| - break;
|
| - }
|
| - }
|
| -
|
| - callback.Run(error, open_link);
|
| -}
|
| -
|
| void ParseAboutResourceAndRun(
|
| const GetAboutResourceCallback& callback,
|
| GDataErrorCode error,
|
| @@ -541,8 +515,7 @@ void GDataWapiService::AuthorizeApp(const std::string& resource_id,
|
| operation_registry(),
|
| url_request_context_getter_,
|
| url_generator_,
|
| - base::Bind(&ParseResourceEntryAndRun,
|
| - base::Bind(&ExtractOpenLinkAndRun, app_id, callback)),
|
| + callback,
|
| resource_id,
|
| app_id));
|
| }
|
|
|