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

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: More merge to ToT. 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 fake_server::FakeServer* GetFakeServer() const; 247 fake_server::FakeServer* GetFakeServer() const;
248 248
249 protected: 249 protected:
250 // Add custom switches needed for running the test. 250 // Add custom switches needed for running the test.
251 virtual void AddTestSwitches(base::CommandLine* cl); 251 virtual void AddTestSwitches(base::CommandLine* cl);
252 252
253 // Append the command line switches to enable experimental types that aren't 253 // Append the command line switches to enable experimental types that aren't
254 // on by default yet. 254 // on by default yet.
255 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl); 255 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
256 256
257 // InProcessBrowserTest override. Destroys all the sync clients and sync 257 // BrowserTestBase override. Destroys all the sync clients and sync
258 // profiles created by a test. 258 // profiles created by a test.
259 virtual void CleanUpOnMainThread() OVERRIDE; 259 virtual void TearDownOnMainThread() OVERRIDE;
260 260
261 // InProcessBrowserTest override. Changes behavior of the default host 261 // InProcessBrowserTest override. Changes behavior of the default host
262 // resolver to avoid DNS lookup errors. 262 // resolver to avoid DNS lookup errors.
263 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 263 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
264 264
265 // InProcessBrowserTest override. Resets the host resolver its default 265 // InProcessBrowserTest override. Resets the host resolver its default
266 // behavior. 266 // behavior.
267 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 267 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
268 268
269 // Creates Profile, Browser and ProfileSyncServiceHarness instances for 269 // Creates Profile, Browser and ProfileSyncServiceHarness instances for
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 // Fake URLFetcher factory used to mock out GAIA signin. 413 // Fake URLFetcher factory used to mock out GAIA signin.
414 scoped_ptr<net::FakeURLFetcherFactory> fake_factory_; 414 scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
415 415
416 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|. 416 // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
417 scoped_ptr<net::URLFetcherImplFactory> factory_; 417 scoped_ptr<net::URLFetcherImplFactory> factory_;
418 418
419 DISALLOW_COPY_AND_ASSIGN(SyncTest); 419 DISALLOW_COPY_AND_ASSIGN(SyncTest);
420 }; 420 };
421 421
422 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 422 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698