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

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

Issue 14694010: Consolidate manifest handler registration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 5c11240036901a7cb8d0ffc58be82c518569c4b5..aea91b26f3d2d4d2740d77b3fc3f6de71d029055 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/permissions/permission_set.h"
+#include "chrome/common/extensions/permissions/permissions_info.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
@@ -63,7 +64,6 @@ ExtensionPrefsTest::~ExtensionPrefsTest() {
void ExtensionPrefsTest::RegisterPreferences(PrefRegistrySyncable* registry) {}
void ExtensionPrefsTest::SetUp() {
- ExtensionTest::SetUp();
RegisterPreferences(prefs_.pref_registry());
Initialize();
}
@@ -78,7 +78,6 @@ void ExtensionPrefsTest::TearDown() {
Verify();
prefs_.pref_service()->CommitPendingWrite();
message_loop_.RunUntilIdle();
- ExtensionTest::TearDown();
}
// Tests the LastPingDay/SetLastPingDay functions.
« no previous file with comments | « chrome/browser/extensions/extension_prefs_unittest.h ('k') | chrome/browser/extensions/extension_process_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698