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

Unified Diff: chrome/browser/extensions/component_loader_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/component_loader_unittest.cc
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 4b2b52a9f0f107bec44192b92b4497b44fdf230d..6b2b9201a01b93d1f483f60f7092788ed01b76f9 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/common/extensions/background_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/extensions/extension_unittest.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "components/user_prefs/pref_registry_syncable.h"
@@ -73,7 +72,7 @@ class MockExtensionService : public TestExtensionService {
} // namespace
-class ComponentLoaderTest : public ExtensionTest {
+class ComponentLoaderTest : public testing::Test {
public:
ComponentLoaderTest()
// Note: we pass the same pref service here, to stand in for both
@@ -82,7 +81,6 @@ class ComponentLoaderTest : public ExtensionTest {
}
virtual void SetUp() OVERRIDE {
- ExtensionTest::SetUp();
extension_path_ =
GetBasePath().AppendASCII("good")
.AppendASCII("Extensions")
« no previous file with comments | « chrome/browser/extensions/chrome_manifest_parser.cc ('k') | chrome/browser/extensions/content_scripts_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698