diff options
author | maxbogue <maxbogue@chromium.org> | 2015-11-18 08:26:58 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 16:28:05 +0000 |
commit | 774f31729ab739d01f63aa3f10b18140b8ea1df2 (patch) | |
tree | 421d5491f1bef42ea175328bfd069e2bb7fa36f3 /sync/test | |
parent | 41f59ba2f0d7c3eceff177a15a17905969ef29b0 (diff) | |
download | chromium_src-774f31729ab739d01f63aa3f10b18140b8ea1df2.zip chromium_src-774f31729ab739d01f63aa3f10b18140b8ea1df2.tar.gz chromium_src-774f31729ab739d01f63aa3f10b18140b8ea1df2.tar.bz2 |
[Sync] Introduce GmsCoreSyncListener.
This change introduces a framework for sharing the user's custom
passphrase encryption key with GmsCore. This is to prevent users from
seeing the custom passphrase dialog pop up in GmsCore after they have
already entered it in Chrome.
BUG=552106
Review URL: https://codereview.chromium.org/1414203016
Cr-Commit-Position: refs/heads/master@{#360344}
Diffstat (limited to 'sync/test')
-rw-r--r-- | sync/test/fake_server/android/fake_server_helper_android.cc | 8 | ||||
-rw-r--r-- | sync/test/fake_server/android/fake_server_helper_android.h | 3 | ||||
-rw-r--r-- | sync/test/fake_server/fake_server.cc | 9 | ||||
-rw-r--r-- | sync/test/fake_server/fake_server.h | 3 |
4 files changed, 21 insertions, 2 deletions
diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/sync/test/fake_server/android/fake_server_helper_android.cc index 4254295..ed5d639 100644 --- a/sync/test/fake_server/android/fake_server_helper_android.cc +++ b/sync/test/fake_server/android/fake_server_helper_android.cc @@ -294,6 +294,14 @@ void FakeServerHelperAndroid::DeleteEntity( fake_server::TombstoneEntity::Create(native_id)); } +void FakeServerHelperAndroid::ClearServerData(JNIEnv* env, + jobject obj, + jlong fake_server) { + fake_server::FakeServer* fake_server_ptr = + reinterpret_cast<fake_server::FakeServer*>(fake_server); + fake_server_ptr->ClearServerData(); +} + // static bool FakeServerHelperAndroid::Register(JNIEnv* env) { return RegisterNativesImpl(env); diff --git a/sync/test/fake_server/android/fake_server_helper_android.h b/sync/test/fake_server/android/fake_server_helper_android.h index a0418ed..fb95af1 100644 --- a/sync/test/fake_server/android/fake_server_helper_android.h +++ b/sync/test/fake_server/android/fake_server_helper_android.h @@ -114,6 +114,9 @@ class FakeServerHelperAndroid { jlong fake_server, jstring id); + // Simulates a dashboard stop and clear. + void ClearServerData(JNIEnv* env, jobject obj, jlong fake_server); + private: virtual ~FakeServerHelperAndroid(); diff --git a/sync/test/fake_server/fake_server.cc b/sync/test/fake_server/fake_server.cc index 7849cd8..1b2f16d 100644 --- a/sync/test/fake_server/fake_server.cc +++ b/sync/test/fake_server/fake_server.cc @@ -186,14 +186,18 @@ FakeServer::FakeServer() : version_(0), network_enabled_(true), enable_implicit_permanent_folder_creation_(false), weak_ptr_factory_(this) { + Init(); +} + +FakeServer::~FakeServer() {} + +void FakeServer::Init() { keystore_keys_.push_back(kDefaultKeystoreKey); const bool create_result = CreateDefaultPermanentItems(); DCHECK(create_result) << "Permanent items were not created successfully."; } -FakeServer::~FakeServer() {} - bool FakeServer::CreatePermanentBookmarkFolder(const std::string& server_tag, const std::string& name) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -619,6 +623,7 @@ void FakeServer::ClearServerData() { entities_.clear(); keystore_keys_.clear(); ++store_birthday_; + Init(); } void FakeServer::SetAuthenticated() { diff --git a/sync/test/fake_server/fake_server.h b/sync/test/fake_server/fake_server.h index 7bcd935..7a55fbe 100644 --- a/sync/test/fake_server/fake_server.h +++ b/sync/test/fake_server/fake_server.h @@ -153,6 +153,9 @@ class FakeServer { typedef base::ScopedPtrMap<std::string, scoped_ptr<FakeServerEntity>> EntityMap; + // Gets FakeServer ready for syncing. + void Init(); + // Processes a GetUpdates call. bool HandleGetUpdatesRequest(const sync_pb::GetUpdatesMessage& get_updates, sync_pb::GetUpdatesResponse* response); |