diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 00:38:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 00:38:35 +0000 |
| commit | 583844c2df50f0f2188aab7eed3fbcc40e499511 (patch) | |
| tree | aaf82f0bf3d39975b2ef42ab9c14716b064c4f59 /chrome/browser/net/gaia | |
| parent | 91099131f5ee2512a33e2b95f69f47d6165b1c40 (diff) | |
| download | chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.zip chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.tar.gz chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.tar.bz2 | |
Switch ChromeTestSuite to the same convention as ContentTestSuite:
the test suite implicitly provides global resources for each test,
but they're re-initialized between each test.
The performance overhead is negligible.
We need that to continue moving tests from unit_tests
to content_unittests. Because of shared test fixtures
the test suites need to be compatible.
BUG=90443
Review URL: http://codereview.chromium.org/7744039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/gaia')
| -rw-r--r-- | chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/net/gaia/token_service_unittest.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc index 22fac88..d92f41b 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc @@ -16,7 +16,6 @@ #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/net/http_return.h" -#include "chrome/test/base/testing_browser_process_test.h" #include "chrome/test/base/testing_profile.h" #include "content/common/notification_service.h" #include "content/common/url_fetcher.h" @@ -148,7 +147,7 @@ TEST(GaiaOAuthFetcherTest, GetOAuthToken) { } #endif // 0 // Suppressing for now -typedef TestingBrowserProcessTest GaiaOAuthFetcherTest; +typedef testing::Test GaiaOAuthFetcherTest; TEST_F(GaiaOAuthFetcherTest, OAuthGetAccessToken) { const std::string oauth_token = diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h index 24761b7..ed2fe00 100644 --- a/chrome/browser/net/gaia/token_service_unittest.h +++ b/chrome/browser/net/gaia/token_service_unittest.h @@ -14,7 +14,6 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/test/base/signaling_task.h" #include "chrome/test/base/test_notification_tracker.h" -#include "chrome/test/base/testing_browser_process_test.h" #include "chrome/test/base/testing_profile.h" #include "content/common/notification_details.h" #include "content/common/notification_source.h" @@ -57,7 +56,7 @@ class TokenFailedTracker : public TestNotificationTracker { TokenService::TokenRequestFailedDetails details_; }; -class TokenServiceTestHarness : public TestingBrowserProcessTest { +class TokenServiceTestHarness : public testing::Test { public: TokenServiceTestHarness(); virtual ~TokenServiceTestHarness(); |