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

Side by Side Diff: chrome/test/live_sync/live_sync_test.h

Issue 7621066: Fix sync test crashing when multiprofiles are enabled on Mac. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months 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
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/test/live_sync/live_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_ 5 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
6 #define CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_ 6 #define CHROME_TEST_LIVE_SYNC_LIVE_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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 // Tells us what kind of server we're using (some tests run only on certain 229 // Tells us what kind of server we're using (some tests run only on certain
230 // server types). 230 // server types).
231 ServerType server_type_; 231 ServerType server_type_;
232 232
233 // Number of sync clients that will be created by a test. 233 // Number of sync clients that will be created by a test.
234 int num_clients_; 234 int num_clients_;
235 235
236 // Collection of sync profiles used by a test. A sync profile maintains sync 236 // Collection of sync profiles used by a test. A sync profile maintains sync
237 // data contained within its own subdirectory under the chrome user data 237 // data contained within its own subdirectory under the chrome user data
238 // directory. 238 // directory.
239 ScopedVector<Profile> profiles_; 239 std::vector<Profile*> profiles_;
240 240
241 // Collection of sync clients used by a test. A sync client is associated with 241 // Collection of sync clients used by a test. A sync client is associated with
242 // a sync profile, and implements methods that sync the contents of the 242 // a sync profile, and implements methods that sync the contents of the
243 // profile with the server. 243 // profile with the server.
244 ScopedVector<ProfileSyncServiceHarness> clients_; 244 ScopedVector<ProfileSyncServiceHarness> clients_;
245 245
246 // Sync profile against which changes to individual profiles are verified. We 246 // Sync profile against which changes to individual profiles are verified. We
247 // don't need a corresponding verifier sync client because the contents of the 247 // don't need a corresponding verifier sync client because the contents of the
248 // verifier profile are strictly local, and are not meant to be synced. 248 // verifier profile are strictly local, and are not meant to be synced.
249 scoped_ptr<Profile> verifier_; 249 Profile* verifier_;
250 250
251 // Indicates whether changes to a profile should also change the verifier 251 // Indicates whether changes to a profile should also change the verifier
252 // profile or not. 252 // profile or not.
253 bool use_verifier_; 253 bool use_verifier_;
254 254
255 // Sync integration tests need to make live DNS requests for access to 255 // Sync integration tests need to make live DNS requests for access to
256 // GAIA and sync server URLs under google.com. We use a scoped version 256 // GAIA and sync server URLs under google.com. We use a scoped version
257 // to override the default resolver while the test is active. 257 // to override the default resolver while the test is active.
258 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; 258 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
259 259
260 // Used to start and stop the local test server. 260 // Used to start and stop the local test server.
261 base::ProcessHandle test_server_handle_; 261 base::ProcessHandle test_server_handle_;
262 262
263 // Fake URLFetcher factory used to mock out GAIA signin. 263 // Fake URLFetcher factory used to mock out GAIA signin.
264 scoped_ptr<FakeURLFetcherFactory> factory_; 264 scoped_ptr<FakeURLFetcherFactory> factory_;
265 265
266 // URLFetcher factory used to contact sync server. 266 // URLFetcher factory used to contact sync server.
267 scoped_ptr<URLFetcherFactory> integration_factory_; 267 scoped_ptr<URLFetcherFactory> integration_factory_;
268 268
269 DISALLOW_COPY_AND_ASSIGN(LiveSyncTest); 269 DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
270 }; 270 };
271 271
272 #endif // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_ 272 #endif // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/test/live_sync/live_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698