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

Unified Diff: chrome/browser/extensions/extension_apitest.cc

Issue 2692153002: Enable SiteIsolationExtensions trial for developers. (Closed)
Patch Set: Remove the TearDownOnMainThread method in ExtensionWebstorePrivateApiTest Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_apitest.h ('k') | testing/variations/fieldtrial_testing_config.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_apitest.cc
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 2b1bb049bb3122f5504ff4cdc1253010e6fd3057..0b70626ed5023777e180e84706eb9908ed21364b 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -151,7 +151,8 @@ ExtensionApiTest::ExtensionApiTest() {
ExtensionApiTest::~ExtensionApiTest() {}
-void ExtensionApiTest::SetUpInProcessBrowserTestFixture() {
+void ExtensionApiTest::SetUpOnMainThread() {
+ ExtensionBrowserTest::SetUpOnMainThread();
DCHECK(!test_config_.get()) << "Previous test did not clear config state.";
test_config_.reset(new base::DictionaryValue());
test_config_->SetString(kTestDataDirectory,
@@ -163,7 +164,8 @@ void ExtensionApiTest::SetUpInProcessBrowserTestFixture() {
test_config_.get());
}
-void ExtensionApiTest::TearDownInProcessBrowserTestFixture() {
+void ExtensionApiTest::TearDownOnMainThread() {
+ ExtensionBrowserTest::TearDownOnMainThread();
extensions::TestGetConfigFunction::set_test_config_state(NULL);
test_config_.reset(NULL);
}
« no previous file with comments | « chrome/browser/extensions/extension_apitest.h ('k') | testing/variations/fieldtrial_testing_config.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698