Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / test / integration / sync_test.h

diff --git a/src/chrome/browser/sync/test/integration/sync_test.h b/src/chrome/browser/sync/test/integration/sync_test.h
index fd11519..4dc3182 100644 (file)
--- a/src/chrome/browser/sync/test/integration/sync_test.h
+++ b/src/chrome/browser/sync/test/integration/sync_test.h
@@ -190,6 +190,9 @@ class SyncTest : public InProcessBrowserTest {
   // Checks if encryption is complete for profile |index|.
   bool IsEncryptionComplete(int index);
 
+  // Waits until IsEncryptionComplete returns true or a timeout is reached.
+  bool AwaitEncryptionComplete(int index);
+
   // Blocks until all sync clients have completed their mutual sync cycles.
   // Returns true if a quiescent state was successfully reached.
   bool AwaitQuiescence();
@@ -254,9 +257,9 @@ class SyncTest : public InProcessBrowserTest {
   // on by default yet.
   virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
 
-  // InProcessBrowserTest override. Destroys all the sync clients and sync
+  // BrowserTestBase override. Destroys all the sync clients and sync
   // profiles created by a test.
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   // InProcessBrowserTest override. Changes behavior of the default host
   // resolver to avoid DNS lookup errors.
@@ -331,6 +334,8 @@ class SyncTest : public InProcessBrowserTest {
   void SetProxyConfig(net::URLRequestContextGetter* context,
                       const net::ProxyConfig& proxy_config);
 
+  void SetupNetwork(net::URLRequestContextGetter* context);
+
   // Helper method used to set up fake responses for kClientLoginUrl,
   // kIssueAuthTokenUrl, kGetUserInfoUrl and kSearchDomainCheckUrl in order to
   // mock out calls to GAIA servers.