summaryrefslogtreecommitdiffstats
path: root/chrome/common/net
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-27 00:38:35 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-27 00:38:35 +0000
commit583844c2df50f0f2188aab7eed3fbcc40e499511 (patch)
treeaaf82f0bf3d39975b2ef42ab9c14716b064c4f59 /chrome/common/net
parent91099131f5ee2512a33e2b95f69f47d6165b1c40 (diff)
downloadchromium_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/common/net')
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc3
-rw-r--r--chrome/common/net/gaia/gaia_oauth_client_unittest.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index 6f12911..42dbe32 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -16,7 +16,6 @@
#include "chrome/common/net/gaia/gaia_urls.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/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
@@ -62,7 +61,7 @@ void MockFetcher::Start() {
}
-class GaiaAuthFetcherTest : public TestingBrowserProcessTest {
+class GaiaAuthFetcherTest : public testing::Test {
public:
GaiaAuthFetcherTest()
: client_login_source_(GaiaUrls::GetInstance()->client_login_url()),
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index 16282cd..d204a79 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -11,7 +11,6 @@
#include "base/string_util.h"
#include "chrome/common/net/gaia/gaia_oauth_client.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/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
@@ -124,7 +123,7 @@ const std::string kDummyRefreshTokenResult =
namespace gaia {
-class GaiaOAuthClientTest : public TestingBrowserProcessTest {
+class GaiaOAuthClientTest : public testing::Test {
public:
GaiaOAuthClientTest() {}