summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_service_unittest.h
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 09:04:37 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 09:04:37 +0000
commite676f8f0050863331707210c9457162e03563ce3 (patch)
tree604fb9098821831debfe19c5044c2f19106e53c6 /chrome/browser/extensions/extension_service_unittest.h
parent56b7e39f89c80273f23b4a0fe5aaa14431d16745 (diff)
downloadchromium_src-e676f8f0050863331707210c9457162e03563ce3.zip
chromium_src-e676f8f0050863331707210c9457162e03563ce3.tar.gz
chromium_src-e676f8f0050863331707210c9457162e03563ce3.tar.bz2
Refactor APIPermission to separate out specific permission registration.
Adds a delegate to the PermissionsInfo global to do the specific registration; adds a ScopedTestingPermissionsInfo for unit tests. Preparation for moving permissions to top-level extensions. Also adds a base class for unittests, ExtensionTest, to deal with manifest handler / permission setup. BUG=162530,172712 Review URL: https://chromiumcodereview.appspot.com/13370002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service_unittest.h')
-rw-r--r--chrome/browser/extensions/extension_service_unittest.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h
index f5bd434..6f46f77 100644
--- a/chrome/browser/extensions/extension_service_unittest.h
+++ b/chrome/browser/extensions/extension_service_unittest.h
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/common/extensions/extension_unittest.h"
#include "chrome/common/extensions/feature_switch.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +23,7 @@ namespace extensions {
class ManagementPolicy;
}
-class ExtensionServiceTestBase : public testing::Test {
+class ExtensionServiceTestBase : public extensions::ExtensionTest {
public:
ExtensionServiceTestBase();
virtual ~ExtensionServiceTestBase();
@@ -48,8 +49,6 @@ class ExtensionServiceTestBase : public testing::Test {
virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
-
void set_extensions_enabled(bool enabled) {
service_->set_extensions_enabled(enabled);
}