diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 09:04:37 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 09:04:37 +0000 |
| commit | e676f8f0050863331707210c9457162e03563ce3 (patch) | |
| tree | 604fb9098821831debfe19c5044c2f19106e53c6 /chrome/browser/extensions/extension_ui_unittest.cc | |
| parent | 56b7e39f89c80273f23b4a0fe5aaa14431d16745 (diff) | |
| download | chromium_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_ui_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_ui_unittest.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index a623506..b91cc7f 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/manifest_handler.h" +#include "chrome/common/extensions/extension_unittest.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" @@ -23,15 +23,15 @@ using extensions::Extension; using extensions::Manifest; -class ExtensionUITest : public testing::Test { +class ExtensionUITest : public extensions::ExtensionTest { public: ExtensionUITest() : ui_thread_(content::BrowserThread::UI, &message_loop_), - file_thread_(content::BrowserThread::FILE, &message_loop_) {} + file_thread_(content::BrowserThread::FILE, &message_loop_) {} protected: virtual void SetUp() OVERRIDE { - testing::Test::SetUp(); + ExtensionTest::SetUp(); // Create an ExtensionService and ManagementPolicy to inject into the // ExtensionSettingsHandler. @@ -54,8 +54,7 @@ class ExtensionUITest : public testing::Test { profile_.reset(); // Execute any pending deletion tasks. message_loop_.RunUntilIdle(); - extensions::ManifestHandler::ClearRegistryForTesting(); - testing::Test::TearDown(); + ExtensionTest::TearDown(); } static DictionaryValue* DeserializeJSONTestData(const base::FilePath& path, |