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

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

Issue 8416020: Handle additional feedback from http://codereview.chromium.org/8395038/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/scoped_vector.h" 17 #include "base/memory/scoped_vector.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "chrome/browser/sync/protocol/sync_protocol_error.h" 19 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
20 #include "chrome/browser/sync/syncable/model_type.h" 20 #include "chrome/browser/sync/syncable/model_type.h"
21 #include "net/base/mock_host_resolver.h" 21 #include "net/base/mock_host_resolver.h"
22 #include "net/test/test_server.h" 22 #include "net/test/test_server.h"
23 23
24 class CommandLine; 24 class CommandLine;
25 class Profile; 25 class Profile;
26 class ProfileSyncServiceHarness; 26 class ProfileSyncServiceHarness;
27 class FakeURLFetcherFactory; 27 class FakeURLFetcherFactory;
28 class URLFetcherFactory; 28 class URLFetcherImplFactory;
29 29
30 namespace net { 30 namespace net {
31 class ProxyConfig; 31 class ProxyConfig;
32 class ScopedDefaultHostResolverProc; 32 class ScopedDefaultHostResolverProc;
33 class URLRequestContextGetter; 33 class URLRequestContextGetter;
34 } 34 }
35 35
36 // This is the base class for integration tests for all sync data types. Derived 36 // This is the base class for integration tests for all sync data types. Derived
37 // classes must be defined for each sync data type. Individual tests are defined 37 // classes must be defined for each sync data type. Individual tests are defined
38 // using the IN_PROC_BROWSER_TEST_F macro. 38 // using the IN_PROC_BROWSER_TEST_F macro.
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // GAIA and sync server URLs under google.com. We use a scoped version 303 // GAIA and sync server URLs under google.com. We use a scoped version
304 // to override the default resolver while the test is active. 304 // to override the default resolver while the test is active.
305 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; 305 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
306 306
307 // Used to start and stop the local test server. 307 // Used to start and stop the local test server.
308 base::ProcessHandle test_server_handle_; 308 base::ProcessHandle test_server_handle_;
309 309
310 // Fake URLFetcher factory used to mock out GAIA signin. 310 // Fake URLFetcher factory used to mock out GAIA signin.
311 scoped_ptr<FakeURLFetcherFactory> fake_factory_; 311 scoped_ptr<FakeURLFetcherFactory> fake_factory_;
312 312
313 // The URLFetcherFactory instance used to instantiate |fake_factory_|. 313 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
314 scoped_ptr<URLFetcherFactory> factory_; 314 scoped_ptr<URLFetcherImplFactory> factory_;
315 315
316 DISALLOW_COPY_AND_ASSIGN(SyncTest); 316 DISALLOW_COPY_AND_ASSIGN(SyncTest);
317 }; 317 };
318 318
319 DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest); 319 DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest);
320 320
321 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 321 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698