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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 fake_server::FakeServer* GetFakeServer() const; 250 fake_server::FakeServer* GetFakeServer() const;
251 251
252 protected: 252 protected:
253 // Add custom switches needed for running the test. 253 // Add custom switches needed for running the test.
254 virtual void AddTestSwitches(base::CommandLine* cl); 254 virtual void AddTestSwitches(base::CommandLine* cl);
255 255
256 // Append the command line switches to enable experimental types that aren't 256 // Append the command line switches to enable experimental types that aren't
257 // on by default yet. 257 // on by default yet.
258 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl); 258 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
259 259
260 // InProcessBrowserTest override. Destroys all the sync clients and sync 260 // BrowserTestBase override. Destroys all the sync clients and sync
261 // profiles created by a test. 261 // profiles created by a test.
262 virtual void CleanUpOnMainThread() OVERRIDE; 262 virtual void TearDownOnMainThread() OVERRIDE;
263 263
264 // InProcessBrowserTest override. Changes behavior of the default host 264 // InProcessBrowserTest override. Changes behavior of the default host
265 // resolver to avoid DNS lookup errors. 265 // resolver to avoid DNS lookup errors.
266 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 266 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
267 267
268 // InProcessBrowserTest override. Resets the host resolver its default 268 // InProcessBrowserTest override. Resets the host resolver its default
269 // behavior. 269 // behavior.
270 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 270 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
271 271
272 // Creates Profile, Browser and ProfileSyncServiceHarness instances for 272 // Creates Profile, Browser and ProfileSyncServiceHarness instances for
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // Fake URLFetcher factory used to mock out GAIA signin. 416 // Fake URLFetcher factory used to mock out GAIA signin.
417 scoped_ptr<net::FakeURLFetcherFactory> fake_factory_; 417 scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
418 418
419 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|. 419 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
420 scoped_ptr<net::URLFetcherImplFactory> factory_; 420 scoped_ptr<net::URLFetcherImplFactory> factory_;
421 421
422 DISALLOW_COPY_AND_ASSIGN(SyncTest); 422 DISALLOW_COPY_AND_ASSIGN(SyncTest);
423 }; 423 };
424 424
425 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 425 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_client_certificate_selector_test.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