Commit a48b5741 authored by satorux@chromium.org's avatar satorux@chromium.org

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
parent ad1a7385
...@@ -1082,7 +1082,6 @@ void GDataFileSystem::OnFeedFromServerLoaded(GetDocumentsParams* params, ...@@ -1082,7 +1082,6 @@ void GDataFileSystem::OnFeedFromServerLoaded(GetDocumentsParams* params,
} }
error = UpdateFromFeed(*params->feed_list, error = UpdateFromFeed(*params->feed_list,
FROM_SERVER,
params->start_changestamp, params->start_changestamp,
params->root_feed_changestamp); params->root_feed_changestamp);
...@@ -3275,7 +3274,6 @@ GDataFileError GDataFileSystem::RemoveEntryFromFileSystem( ...@@ -3275,7 +3274,6 @@ GDataFileError GDataFileSystem::RemoveEntryFromFileSystem(
GDataFileError GDataFileSystem::UpdateFromFeed( GDataFileError GDataFileSystem::UpdateFromFeed(
const std::vector<DocumentFeed*>& feed_list, const std::vector<DocumentFeed*>& feed_list,
ContentOrigin origin,
int start_changestamp, int start_changestamp,
int root_feed_changestamp) { int root_feed_changestamp) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
...@@ -3283,7 +3281,7 @@ GDataFileError GDataFileSystem::UpdateFromFeed( ...@@ -3283,7 +3281,7 @@ GDataFileError GDataFileSystem::UpdateFromFeed(
bool is_delta_feed = start_changestamp != 0; bool is_delta_feed = start_changestamp != 0;
directory_service_->set_origin(origin); directory_service_->set_origin(FROM_SERVER);
int delta_feed_changestamp = 0; int delta_feed_changestamp = 0;
FeedToFileResourceMapUmaStats uma_stats; FeedToFileResourceMapUmaStats uma_stats;
......
...@@ -521,7 +521,6 @@ class GDataFileSystem : public GDataFileSystemInterface, ...@@ -521,7 +521,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
// histograms. // histograms.
GDataFileError UpdateFromFeed( GDataFileError UpdateFromFeed(
const std::vector<DocumentFeed*>& feed_list, const std::vector<DocumentFeed*>& feed_list,
ContentOrigin origin,
int largest_changestamp, int largest_changestamp,
int root_feed_changestamp); int root_feed_changestamp);
......
...@@ -330,7 +330,6 @@ class GDataFileSystemTest : public testing::Test { ...@@ -330,7 +330,6 @@ class GDataFileSystemTest : public testing::Test {
GURL unused; GURL unused;
return file_system_->UpdateFromFeed( return file_system_->UpdateFromFeed(
list, list,
FROM_SERVER,
largest_changestamp, largest_changestamp,
root_feed_changestamp_++) == GDATA_FILE_OK; root_feed_changestamp_++) == GDATA_FILE_OK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment