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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

Issue 14694010: Consolidate manifest handler registration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/extensions/background_info.h" 11 #include "chrome/common/extensions/background_info.h"
12 #include "chrome/common/extensions/extension.h" 12 #include "chrome/common/extensions/extension.h"
13 #include "chrome/common/extensions/extension_manifest_constants.h" 13 #include "chrome/common/extensions/extension_manifest_constants.h"
14 #include "chrome/common/extensions/features/base_feature_provider.h" 14 #include "chrome/common/extensions/features/base_feature_provider.h"
15 #include "chrome/common/extensions/features/feature.h" 15 #include "chrome/common/extensions/features/feature.h"
16 #include "chrome/common/extensions/manifest_handler.h"
17 #include "extensions/common/error_utils.h" 16 #include "extensions/common/error_utils.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 18
20 namespace errors = extension_manifest_errors; 19 namespace errors = extension_manifest_errors;
21 namespace keys = extension_manifest_keys; 20 namespace keys = extension_manifest_keys;
22 21
23 namespace extensions { 22 namespace extensions {
24 23
25 class ExtensionManifestBackgroundTest : public ExtensionManifestTest { 24 class ExtensionManifestBackgroundTest : public ExtensionManifestTest {
26 virtual void SetUp() OVERRIDE {
27 ExtensionManifestTest::SetUp();
28 (new BackgroundManifestHandler)->Register();
29 }
30 }; 25 };
31 26
32 TEST_F(ExtensionManifestBackgroundTest, BackgroundPermission) { 27 TEST_F(ExtensionManifestBackgroundTest, BackgroundPermission) {
33 LoadAndExpectError("background_permission.json", 28 LoadAndExpectError("background_permission.json",
34 errors::kBackgroundPermissionNeeded); 29 errors::kBackgroundPermissionNeeded);
35 } 30 }
36 31
37 TEST_F(ExtensionManifestBackgroundTest, BackgroundScripts) { 32 TEST_F(ExtensionManifestBackgroundTest, BackgroundScripts) {
38 std::string error; 33 std::string error;
39 scoped_ptr<base::DictionaryValue> manifest( 34 scoped_ptr<base::DictionaryValue> manifest(
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension)); 104 EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension));
110 105
111 base::ListValue* permissions = new base::ListValue(); 106 base::ListValue* permissions = new base::ListValue();
112 permissions->Append(new base::StringValue("webRequest")); 107 permissions->Append(new base::StringValue("webRequest"));
113 manifest->Set(keys::kPermissions, permissions); 108 manifest->Set(keys::kPermissions, permissions);
114 LoadAndExpectError(Manifest(manifest.get(), ""), 109 LoadAndExpectError(Manifest(manifest.get(), ""),
115 errors::kWebRequestConflictsWithLazyBackground); 110 errors::kWebRequestConflictsWithLazyBackground);
116 } 111 }
117 112
118 } // namespace extensions 113 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698