Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc |
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc |
index 48db51d84cf54d66efb8501e2fceb949766ebe89..a97f783f06ead38d86b9ed0e8c36650c07fd047e 100644 |
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc |
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc |
@@ -58,19 +58,18 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest, |
GetProfileAttributesWithPath(profile()->GetPath(), &entry)); |
entry->SetAuthInfo( |
kTestGaiaId, base::UTF8ToUTF16(test_account_id_.GetUserEmail())); |
- ExtensionApiTest::SetUpOnMainThread(); |
- } |
- |
- protected: |
- // ExtensionApiTest override: |
- void RunTestOnMainThreadLoop() override { |
registrar_.Add(this, |
extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE, |
content::NotificationService::AllSources()); |
- ExtensionApiTest::RunTestOnMainThreadLoop(); |
+ ExtensionApiTest::SetUpOnMainThread(); |
+ } |
+ |
+ void TearDownOnMainThread() override { |
+ ExtensionApiTest::TearDownOnMainThread(); |
registrar_.RemoveAll(); |
} |
+ protected: |
// content::NotificationObserver override: |
void Observe(int type, |
const content::NotificationSource& source, |