summaryrefslogtreecommitdiffstats
path: root/sync/test
diff options
context:
space:
mode:
authorpvalenzuela@chromium.org <pvalenzuela@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 19:42:59 +0000
committerpvalenzuela@chromium.org <pvalenzuela@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 19:42:59 +0000
commit3d3f27840210fe2406fbafe269c8a5afe1af8fa3 (patch)
treea82cbe8f326184b8c0dcbd1b5c3c7bc4a8274f0a /sync/test
parente84b5208e28febdf8b926245f0ac731e0cb3181f (diff)
downloadchromium_src-3d3f27840210fe2406fbafe269c8a5afe1af8fa3.zip
chromium_src-3d3f27840210fe2406fbafe269c8a5afe1af8fa3.tar.gz
chromium_src-3d3f27840210fe2406fbafe269c8a5afe1af8fa3.tar.bz2
Create mobile bookmarks folder in Sync FakeServer
This folder is created on demand when a client requests it. BUG=323265 Review URL: https://codereview.chromium.org/212103011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
-rw-r--r--sync/test/fake_server/fake_server.cc21
-rw-r--r--sync/test/fake_server/fake_server.h3
2 files changed, 22 insertions, 2 deletions
diff --git a/sync/test/fake_server/fake_server.cc b/sync/test/fake_server/fake_server.cc
index f49578a..d44814e 100644
--- a/sync/test/fake_server/fake_server.cc
+++ b/sync/test/fake_server/fake_server.cc
@@ -202,8 +202,21 @@ bool FakeServer::CreateDefaultPermanentItems(
}
}
- // TODO(pvalenzuela): Create the mobile bookmarks folder when the fake server
- // is used by mobile tests.
+ return true;
+}
+
+bool FakeServer::CreateMobileBookmarksPermanentItem() {
+ // This folder is called "Synced Bookmarks" by sync and is renamed
+ // "Mobile Bookmarks" by the mobile client UIs.
+ FakeServerEntity* mobile_bookmarks_entity =
+ PermanentEntity::Create(syncer::BOOKMARKS,
+ "synced_bookmarks",
+ "Synced Bookmarks",
+ ModelTypeToRootTag(syncer::BOOKMARKS));
+ if (mobile_bookmarks_entity == NULL) {
+ return false;
+ }
+ SaveEntity(mobile_bookmarks_entity);
return true;
}
@@ -259,6 +272,10 @@ bool FakeServer::HandleGetUpdatesRequest(
if (!CreateDefaultPermanentItems(sieve->GetFirstTimeTypes())) {
return false;
}
+ if (get_updates.create_mobile_bookmarks_folder() &&
+ !CreateMobileBookmarksPermanentItem()) {
+ return false;
+ }
bool send_encryption_keys_based_on_nigori = false;
int64 max_response_version = 0;
diff --git a/sync/test/fake_server/fake_server.h b/sync/test/fake_server/fake_server.h
index 61c14ee..511bcae 100644
--- a/sync/test/fake_server/fake_server.h
+++ b/sync/test/fake_server/fake_server.h
@@ -44,6 +44,9 @@ class FakeServer {
bool CreateDefaultPermanentItems(
const std::vector<syncer::ModelType>& first_time_types);
+ // Inserts the mobile bookmarks folder entity in |entities_|.
+ bool CreateMobileBookmarksPermanentItem();
+
// Saves a |entity| to |entities_|.
void SaveEntity(FakeServerEntity* entity);