| Index: chrome/browser/sync/test/integration/sync_test.h
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
|
| index 6ba2eb3dc13bfe1399459f6be2b97d5f55191f84..51bc54f9685d9a15d85d0996c41eb63b1e9f7cdd 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.h
|
| +++ b/chrome/browser/sync/test/integration/sync_test.h
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "components/sync/base/model_type.h"
|
| +#include "components/sync/driver/sync_service.h"
|
| #include "components/sync/protocol/sync_protocol_error.h"
|
| #include "components/sync/test/fake_server/fake_server.h"
|
| #include "components/sync/test/local_sync_test_server.h"
|
| @@ -97,18 +98,18 @@ class SyncTest : public InProcessBrowserTest {
|
| // The type of server we're running against.
|
| enum ServerType {
|
| SERVER_TYPE_UNDECIDED,
|
| - LOCAL_PYTHON_SERVER, // The mock python server that runs locally and is
|
| - // part of the Chromium checkout.
|
| - LOCAL_LIVE_SERVER, // Some other server (maybe the real binary used by
|
| - // Google's sync service) that can be started on
|
| - // a per-test basis by running a command
|
| - EXTERNAL_LIVE_SERVER, // A remote server that the test code has no control
|
| - // over whatsoever; cross your fingers that the
|
| - // account state is initially clean.
|
| - IN_PROCESS_FAKE_SERVER, // The fake Sync server (FakeServer) running
|
| - // in-process (bypassing HTTP calls). This
|
| - // ServerType will eventually replace
|
| - // LOCAL_PYTHON_SERVER.
|
| + LOCAL_PYTHON_SERVER, // The mock python server that runs locally and is
|
| + // part of the Chromium checkout.
|
| + LOCAL_LIVE_SERVER, // Some other server (maybe the real binary used by
|
| + // Google's sync service) that can be started on
|
| + // a per-test basis by running a command
|
| + EXTERNAL_LIVE_SERVER, // A remote server that the test code has no control
|
| + // over whatsoever; cross your fingers that the
|
| + // account state is initially clean.
|
| + IN_PROCESS_FAKE_SERVER, // The fake Sync server (FakeServer) running
|
| + // in-process (bypassing HTTP calls). This
|
| + // ServerType will eventually replace
|
| + // LOCAL_PYTHON_SERVER.
|
| };
|
|
|
| // A SyncTest must be associated with a particular test type.
|
| @@ -192,6 +193,17 @@ class SyncTest : public InProcessBrowserTest {
|
| // Waits until IsEncryptionComplete returns true or a timeout is reached.
|
| bool AwaitEncryptionComplete(int index);
|
|
|
| + // Sets the cryptographer's encryption passphrase for the profile at index
|
| + // |index| to |passphrase|, and passphrase type |type|.
|
| + void SetEncryptionPassphrase(int index,
|
| + const std::string& passphrase,
|
| + sync_driver::SyncService::PassphraseType type);
|
| +
|
| + // Sets the cryptographer's decryption passphrase for the profile at index
|
| + // |index| to |passphrase|. Returns false if the operation failed, and true
|
| + // otherwise.
|
| + bool SetDecryptionPassphrase(int index, const std::string& passphrase);
|
| +
|
| // Blocks until all sync clients have completed their mutual sync cycles.
|
| // Returns true if a quiescent state was successfully reached.
|
| bool AwaitQuiescence();
|
|
|