summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/gdata
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 20:22:09 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 20:22:09 +0000
commitd7ac7c264e1bdbee971bd4996c5b920eb813e01e (patch)
treedb269ac75d2653076223d909bae044742579c0a4 /chrome/browser/chromeos/gdata
parent2a00b0f7cc9f0b449d81458c50dd19d7c8b8791a (diff)
downloadchromium_src-d7ac7c264e1bdbee971bd4996c5b920eb813e01e.zip
chromium_src-d7ac7c264e1bdbee971bd4996c5b920eb813e01e.tar.gz
chromium_src-d7ac7c264e1bdbee971bd4996c5b920eb813e01e.tar.bz2
drive: Fix a crash in gdata::GDataWapiFeedLoader::OnGetChangelist()
Yet another base::Passed(&scoped_ptr) issue. This is essentially identical to crbug.com/147659 but only occurs with --enable-drive-v2-api BUG=148750 TEST=crash is gone with an account with many files on drive, with --enable-drive-v2-api Review URL: https://codereview.chromium.org/10933053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/gdata')
-rw-r--r--chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc b/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
index 1c19363..39d56e4 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
+++ b/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
@@ -685,9 +685,11 @@ void GDataWapiFeedLoader::OnGetChangelist(
ui_state->feed_fetching_elapsed_time = base::TimeTicks::Now() - start_time;
// Kick off the remaining part of the feeds.
+ // Extract the pointer so we can use it bellow.
+ LoadFeedParams* params_ptr = params.get();
drive_service_->GetDocuments(
current_feed->next_link(),
- params->start_changestamp,
+ params_ptr->start_changestamp,
std::string(), // No search query.
std::string(), // No directory resource ID.
base::Bind(&GDataWapiFeedLoader::OnGetChangelist,