Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

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

 // Copyright (c) 2011 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_
 #pragma once
 
 #include "chrome/test/base/in_process_browser_test.h"
 
@@ skipping 162 matching lines @@
   // Triggers a transient error on the server. Note the server will stay in
   // this state until shut down.
   void TriggerTransientError();
 
   // Triggers a sync error on the server.
   void TriggerSyncError(const browser_sync::SyncProtocolError& error);
 
   // Triggers setting the sync_tabs field of the nigori node.
   void TriggerSetSyncTabs();
 
+  // Returns the number of default items that every client syncs.
+  int NumberOfDefaultItems() const;

[Raghu Simha, 2011/11/07 22:18:12]

nit: Perhaps name this NumberOfDefaultSyncItems() to make its purpose clear?

[SteveT, 2011/11/08 00:17:27]

Sure. Done here and in sync_test.cc. Had to reformat the lines using this in
two_client_sessions_sync_test.cc. Let me know if you're happy with that change.

+
  protected:
   // Add custom switches needed for running the test.
   virtual void AddTestSwitches(CommandLine* cl);
 
   // Append the command line switches to enable experimental types that aren't
   // on by default yet.
   virtual void AddOptionalTypesToCommandLine(CommandLine* cl);
 
   // InProcessBrowserTest override. Destroys all the sync clients and sync
   // profiles created by a test.
@@ skipping 119 matching lines @@
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   scoped_ptr<URLFetcherImplFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest);
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_