diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 00:43:58 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 00:43:58 +0000 |
| commit | a48b5741089f7fbc06f23ad0851787e6c2c07f48 (patch) | |
| tree | e21c3dfa0681380ef2393b20ada6208092d8cb88 /chrome | |
| parent | ad1a73858dc1039a2c37d3175a56347a3cfc1aef (diff) | |
| download | chromium_src-a48b5741089f7fbc06f23ad0851787e6c2c07f48.zip chromium_src-a48b5741089f7fbc06f23ad0851787e6c2c07f48.tar.gz chromium_src-a48b5741089f7fbc06f23ad0851787e6c2c07f48.tar.bz2 | |
gdata: Remove 'origin' parameter from GDataFileSystem::UpdateFromFeed()
Feeds are always come from the server. There is no need to take
FROM_SERVER from callers.
BUG=130669
TEST=out/Release/unit_tests --gtest_filter=GData* && out/Release/browser_tests --gtest_filter=GData*
Review URL: https://chromiumcodereview.appspot.com/10827108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/gdata/gdata_file_system.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/gdata/gdata_file_system.h | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc index 824fe9c..1c01d33 100644 --- a/chrome/browser/chromeos/gdata/gdata_file_system.cc +++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc @@ -1082,7 +1082,6 @@ void GDataFileSystem::OnFeedFromServerLoaded(GetDocumentsParams* params, } error = UpdateFromFeed(*params->feed_list, - FROM_SERVER, params->start_changestamp, params->root_feed_changestamp); @@ -3275,7 +3274,6 @@ GDataFileError GDataFileSystem::RemoveEntryFromFileSystem( GDataFileError GDataFileSystem::UpdateFromFeed( const std::vector<DocumentFeed*>& feed_list, - ContentOrigin origin, int start_changestamp, int root_feed_changestamp) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -3283,7 +3281,7 @@ GDataFileError GDataFileSystem::UpdateFromFeed( bool is_delta_feed = start_changestamp != 0; - directory_service_->set_origin(origin); + directory_service_->set_origin(FROM_SERVER); int delta_feed_changestamp = 0; FeedToFileResourceMapUmaStats uma_stats; diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h index deab872..ce00299 100644 --- a/chrome/browser/chromeos/gdata/gdata_file_system.h +++ b/chrome/browser/chromeos/gdata/gdata_file_system.h @@ -521,7 +521,6 @@ class GDataFileSystem : public GDataFileSystemInterface, // histograms. GDataFileError UpdateFromFeed( const std::vector<DocumentFeed*>& feed_list, - ContentOrigin origin, int largest_changestamp, int root_feed_changestamp); diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc index 0bde982..23e8a95 100644 --- a/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc +++ b/chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc @@ -330,7 +330,6 @@ class GDataFileSystemTest : public testing::Test { GURL unused; return file_system_->UpdateFromFeed( list, - FROM_SERVER, largest_changestamp, root_feed_changestamp_++) == GDATA_FILE_OK; } |