reland of [sync] Add Sessions integration tests

chrome/browser/sync/test/integration/sync_test.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 108 matching lines @@
   // specified.
   void SetUp() override;
 
   // Brings down local python test server if one was created.
   void TearDown() override;
 
   // Sets up command line flags required for sync tests.
   void SetUpCommandLine(base::CommandLine* cl) override;
 
   // Used to get the number of sync clients used by a test.
-  int num_clients() WARN_UNUSED_RESULT { return num_clients_; }
+  int num_clients() { return num_clients_; }
 
   // Returns a pointer to a particular sync profile. Callee owns the object
   // and manages its lifetime.
-  Profile* GetProfile(int index) WARN_UNUSED_RESULT;
+  Profile* GetProfile(int index);
 
   // Returns a list of all profiles including the verifier if available. Callee
   // owns the objects and manages its lifetime.
   std::vector<Profile*> GetAllProfiles();
 
   // Returns a pointer to a particular browser. Callee owns the object
   // and manages its lifetime.
-  Browser* GetBrowser(int index) WARN_UNUSED_RESULT;
+  Browser* GetBrowser(int index);
+
+  // Adds a new browser belonging to the profile at |profile_index|, and appends
+  // it to the list of browsers. Creates a copy of the Profile pointer in
+  // position |profile_index| and appends it to the list of profiles. This is
+  // done so that the profile associated with the new browser can be found at
+  // the same index as it. Tests typically use browser indexes and profile
+  // indexes interchangeably; this allows them to do so freely.
+  Browser* AddBrowser(int profile_index);
 
   // Returns a pointer to a particular sync client. Callee owns the object
   // and manages its lifetime.
-  ProfileSyncServiceHarness* GetClient(int index) WARN_UNUSED_RESULT;
+  ProfileSyncServiceHarness* GetClient(int index);
 
   // Returns a reference to the collection of sync clients. Callee owns the
   // object and manages its lifetime.
-  std::vector<ProfileSyncServiceHarness*>& clients() WARN_UNUSED_RESULT {
-    return clients_.get();
-  }
+  std::vector<ProfileSyncServiceHarness*>& clients() { return clients_.get(); }
 
   // Returns a ProfileSyncService at the given index.
   browser_sync::ProfileSyncService* GetSyncService(int index);
 
   // Returns the set of ProfileSyncServices.
   std::vector<browser_sync::ProfileSyncService*> GetSyncServices();
 
   // Returns a pointer to the sync profile that is used to verify changes to
   // individual sync profiles. Callee owns the object and manages its lifetime.
-  Profile* verifier() WARN_UNUSED_RESULT;
+  Profile* verifier();
 
   // Used to determine whether the verifier profile should be updated or not.
-  bool use_verifier() WARN_UNUSED_RESULT { return use_verifier_; }
+  bool use_verifier() { return use_verifier_; }
 
   // After calling this method, changes made to a profile will no longer be
   // reflected in the verifier profile. Note: Not all datatypes use this.
   // TODO(rsimha): Hook up all datatypes to this mechanism.
   void DisableVerifier();
 
   // Initializes sync clients and profiles but does not sync any of them.
   virtual bool SetupClients() WARN_UNUSED_RESULT;
 
   // Initializes sync clients and profiles if required and syncs each of them.
@@ skipping 283 matching lines @@
   std::unique_ptr<net::URLFetcherImplFactory> factory_;
 
   // The contents to be written to a profile's Preferences file before the
   // Profile object is created. If empty, no preexisting file will be written.
   std::string preexisting_preferences_file_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_