Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.h

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Merge to TOT and fixed additional conflicts from rsimha. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 10
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 // Triggers a transient error on the server. Note the server will stay in 174 // Triggers a transient error on the server. Note the server will stay in
175 // this state until shut down. 175 // this state until shut down.
176 void TriggerTransientError(); 176 void TriggerTransientError();
177 177
178 // Triggers a sync error on the server. 178 // Triggers a sync error on the server.
179 void TriggerSyncError(const browser_sync::SyncProtocolError& error); 179 void TriggerSyncError(const browser_sync::SyncProtocolError& error);
180 180
181 // Triggers setting the sync_tabs field of the nigori node. 181 // Triggers setting the sync_tabs field of the nigori node.
182 void TriggerSetSyncTabs(); 182 void TriggerSetSyncTabs();
183 183
184 // Returns the number of default items that every client syncs.
185 int NumberOfDefaultSyncItems() const;
186
184 protected: 187 protected:
185 // Add custom switches needed for running the test. 188 // Add custom switches needed for running the test.
186 virtual void AddTestSwitches(CommandLine* cl); 189 virtual void AddTestSwitches(CommandLine* cl);
187 190
188 // Append the command line switches to enable experimental types that aren't 191 // Append the command line switches to enable experimental types that aren't
189 // on by default yet. 192 // on by default yet.
190 virtual void AddOptionalTypesToCommandLine(CommandLine* cl); 193 virtual void AddOptionalTypesToCommandLine(CommandLine* cl);
191 194
192 // InProcessBrowserTest override. Destroys all the sync clients and sync 195 // InProcessBrowserTest override. Destroys all the sync clients and sync
193 // profiles created by a test. 196 // profiles created by a test.
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 316
314 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|. 317 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
315 scoped_ptr<URLFetcherImplFactory> factory_; 318 scoped_ptr<URLFetcherImplFactory> factory_;
316 319
317 DISALLOW_COPY_AND_ASSIGN(SyncTest); 320 DISALLOW_COPY_AND_ASSIGN(SyncTest);
318 }; 321 };
319 322
320 DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest); 323 DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest);
321 324
322 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 325 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/search_engines_helper.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698