Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/browser/extensions/api/declarative_content/content_action.h" | 5 #include "chrome/browser/extensions/api/declarative_content/content_action.h" |
| 6 | 6 |
| 7 #include "base/run_loop.h" | |
| 7 #include "base/test/values_test_util.h" | 8 #include "base/test/values_test_util.h" |
| 8 #include "chrome/browser/extensions/extension_action.h" | 9 #include "chrome/browser/extensions/extension_action.h" |
| 9 #include "chrome/browser/extensions/extension_action_manager.h" | 10 #include "chrome/browser/extensions/extension_action_manager.h" |
| 11 #include "chrome/browser/extensions/extension_service_test_base.h" | |
| 10 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
| 11 #include "chrome/browser/extensions/test_extension_environment.h" | 13 #include "chrome/browser/extensions/test_extension_environment.h" |
| 14 #include "chrome/browser/extensions/test_extension_system.h" | |
| 15 #include "chrome/test/base/testing_profile.h" | |
| 12 #include "chrome/test/base/testing_profile.h" | 16 #include "chrome/test/base/testing_profile.h" |
| 13 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 18 #include "extensions/browser/extension_registry.h" | |
| 19 #include "extensions/browser/extension_system.h" | |
| 20 #include "extensions/common/extension.h" | |
| 14 #include "extensions/common/extension_builder.h" | 21 #include "extensions/common/extension_builder.h" |
| 15 #include "testing/gmock/include/gmock/gmock.h" | 22 #include "testing/gmock/include/gmock/gmock.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 24 |
| 18 namespace extensions { | 25 namespace extensions { |
| 19 namespace { | 26 namespace { |
| 20 | 27 |
| 21 using base::test::ParseJson; | 28 using base::test::ParseJson; |
| 22 using testing::HasSubstr; | 29 using testing::HasSubstr; |
| 23 | 30 |
| 31 | |
| 32 scoped_ptr<base::DictionaryValue> SimpleManifest() { | |
| 33 return DictionaryBuilder() | |
| 34 .Set("name", "extension") | |
| 35 .Set("manifest_version", 2) | |
| 36 .Set("version", "1.0") | |
| 37 .Build(); | |
| 38 } | |
| 39 | |
| 40 class RequestContentScriptTest : public ExtensionServiceTestBase { | |
| 41 public: | |
| 42 RequestContentScriptTest(); | |
| 43 | |
| 44 virtual void SetUp() OVERRIDE; | |
| 45 | |
| 46 Profile* profile() { return profile_.get(); } | |
| 47 Extension* extension() { return extension_.get(); } | |
| 48 | |
| 49 private: | |
| 50 scoped_refptr<Extension> extension_; | |
| 51 }; | |
| 52 | |
| 53 RequestContentScriptTest::RequestContentScriptTest() | |
| 54 : extension_(ExtensionBuilder().SetManifest(SimpleManifest()).Build()) {} | |
| 55 | |
| 56 void RequestContentScriptTest::SetUp() { | |
|
Devlin
2014/08/28 17:58:10
You should always call the superclass's SetUp() me
Mark Dittmer
2014/08/28 19:57:08
I'll keep that in mind. This has been replaced wit
| |
| 57 InitializeEmptyExtensionService(); | |
| 58 static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile()))-> | |
| 59 SetReady(); | |
| 60 base::RunLoop().RunUntilIdle(); | |
| 61 } | |
| 62 | |
| 24 TEST(DeclarativeContentActionTest, InvalidCreation) { | 63 TEST(DeclarativeContentActionTest, InvalidCreation) { |
| 25 TestExtensionEnvironment env; | 64 TestExtensionEnvironment env; |
| 26 std::string error; | 65 std::string error; |
| 27 bool bad_message = false; | 66 bool bad_message = false; |
| 28 scoped_refptr<const ContentAction> result; | 67 scoped_refptr<const ContentAction> result; |
| 29 | 68 |
| 30 // Test wrong data type passed. | 69 // Test wrong data type passed. |
| 31 error.clear(); | 70 error.clear(); |
| 32 result = ContentAction::Create(NULL, *ParseJson("[]"), &error, &bad_message); | 71 result = ContentAction::Create( |
| 72 NULL, NULL, *ParseJson("[]"), &error, &bad_message); | |
| 33 EXPECT_TRUE(bad_message); | 73 EXPECT_TRUE(bad_message); |
| 34 EXPECT_EQ("", error); | 74 EXPECT_EQ("", error); |
| 35 EXPECT_FALSE(result.get()); | 75 EXPECT_FALSE(result.get()); |
| 36 | 76 |
| 37 // Test missing instanceType element. | 77 // Test missing instanceType element. |
| 38 error.clear(); | 78 error.clear(); |
| 39 result = ContentAction::Create(NULL, *ParseJson("{}"), &error, &bad_message); | 79 result = ContentAction::Create( |
| 80 NULL, NULL, *ParseJson("{}"), &error, &bad_message); | |
| 40 EXPECT_TRUE(bad_message); | 81 EXPECT_TRUE(bad_message); |
| 41 EXPECT_EQ("", error); | 82 EXPECT_EQ("", error); |
| 42 EXPECT_FALSE(result.get()); | 83 EXPECT_FALSE(result.get()); |
| 43 | 84 |
| 44 // Test wrong instanceType element. | 85 // Test wrong instanceType element. |
| 45 error.clear(); | 86 error.clear(); |
| 46 result = ContentAction::Create(NULL, *ParseJson( | 87 result = ContentAction::Create(NULL, NULL, *ParseJson( |
| 47 "{\n" | 88 "{\n" |
| 48 " \"instanceType\": \"declarativeContent.UnknownType\",\n" | 89 " \"instanceType\": \"declarativeContent.UnknownType\",\n" |
| 49 "}"), | 90 "}"), |
| 50 &error, &bad_message); | 91 &error, &bad_message); |
| 51 EXPECT_THAT(error, HasSubstr("invalid instanceType")); | 92 EXPECT_THAT(error, HasSubstr("invalid instanceType")); |
| 52 EXPECT_FALSE(result.get()); | 93 EXPECT_FALSE(result.get()); |
| 53 } | 94 } |
| 54 | 95 |
| 55 TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) { | 96 TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) { |
| 56 TestExtensionEnvironment env; | 97 TestExtensionEnvironment env; |
| 57 | 98 |
| 58 const Extension* extension = env.MakeExtension(base::DictionaryValue()); | 99 const Extension* extension = env.MakeExtension(base::DictionaryValue()); |
| 59 std::string error; | 100 std::string error; |
| 60 bool bad_message = false; | 101 bool bad_message = false; |
| 61 scoped_refptr<const ContentAction> result = ContentAction::Create( | 102 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 103 NULL, | |
| 62 extension, | 104 extension, |
| 63 *ParseJson( | 105 *ParseJson( |
| 64 "{\n" | 106 "{\n" |
| 65 " \"instanceType\": \"declarativeContent.ShowPageAction\",\n" | 107 " \"instanceType\": \"declarativeContent.ShowPageAction\",\n" |
| 66 "}"), | 108 "}"), |
| 67 &error, | 109 &error, |
| 68 &bad_message); | 110 &bad_message); |
| 69 EXPECT_THAT(error, testing::HasSubstr("without a page action")); | 111 EXPECT_THAT(error, testing::HasSubstr("without a page action")); |
| 70 EXPECT_FALSE(bad_message); | 112 EXPECT_FALSE(bad_message); |
| 71 ASSERT_FALSE(result.get()); | 113 ASSERT_FALSE(result.get()); |
| 72 } | 114 } |
| 73 | 115 |
| 74 TEST(DeclarativeContentActionTest, ShowPageAction) { | 116 TEST(DeclarativeContentActionTest, ShowPageAction) { |
| 75 TestExtensionEnvironment env; | 117 TestExtensionEnvironment env; |
| 76 | 118 |
| 77 const Extension* extension = env.MakeExtension( | 119 const Extension* extension = env.MakeExtension( |
| 78 *ParseJson("{\"page_action\": { \"default_title\": \"Extension\" } }")); | 120 *ParseJson("{\"page_action\": { \"default_title\": \"Extension\" } }")); |
| 79 std::string error; | 121 std::string error; |
| 80 bool bad_message = false; | 122 bool bad_message = false; |
| 81 scoped_refptr<const ContentAction> result = ContentAction::Create( | 123 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 124 NULL, | |
| 82 extension, | 125 extension, |
| 83 *ParseJson( | 126 *ParseJson( |
| 84 "{\n" | 127 "{\n" |
| 85 " \"instanceType\": \"declarativeContent.ShowPageAction\",\n" | 128 " \"instanceType\": \"declarativeContent.ShowPageAction\",\n" |
| 86 "}"), | 129 "}"), |
| 87 &error, | 130 &error, |
| 88 &bad_message); | 131 &bad_message); |
| 89 EXPECT_EQ("", error); | 132 EXPECT_EQ("", error); |
| 90 EXPECT_FALSE(bad_message); | 133 EXPECT_FALSE(bad_message); |
| 91 ASSERT_TRUE(result.get()); | 134 ASSERT_TRUE(result.get()); |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 102 result->Apply(extension->id(), base::Time(), &apply_info); | 145 result->Apply(extension->id(), base::Time(), &apply_info); |
| 103 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); | 146 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); |
| 104 result->Apply(extension->id(), base::Time(), &apply_info); | 147 result->Apply(extension->id(), base::Time(), &apply_info); |
| 105 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); | 148 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); |
| 106 result->Revert(extension->id(), base::Time(), &apply_info); | 149 result->Revert(extension->id(), base::Time(), &apply_info); |
| 107 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); | 150 EXPECT_TRUE(page_action->GetIsVisible(tab_id)); |
| 108 result->Revert(extension->id(), base::Time(), &apply_info); | 151 result->Revert(extension->id(), base::Time(), &apply_info); |
| 109 EXPECT_FALSE(page_action->GetIsVisible(tab_id)); | 152 EXPECT_FALSE(page_action->GetIsVisible(tab_id)); |
| 110 } | 153 } |
| 111 | 154 |
| 112 TEST(DeclarativeContentActionTest, RequestContentScriptMissingScripts) { | 155 TEST_F(RequestContentScriptTest, MissingScripts) { |
| 113 TestExtensionEnvironment env; | |
| 114 | |
| 115 std::string error; | 156 std::string error; |
| 116 bool bad_message = false; | 157 bool bad_message = false; |
| 117 scoped_refptr<const ContentAction> result = ContentAction::Create( | 158 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 118 NULL, | 159 profile(), |
| 160 extension(), | |
| 119 *ParseJson( | 161 *ParseJson( |
| 120 "{\n" | 162 "{\n" |
| 121 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 163 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 122 " \"allFrames\": true,\n" | 164 " \"allFrames\": true,\n" |
| 123 " \"matchAboutBlank\": true\n" | 165 " \"matchAboutBlank\": true\n" |
| 124 "}"), | 166 "}"), |
| 125 &error, | 167 &error, |
| 126 &bad_message); | 168 &bad_message); |
| 127 EXPECT_THAT(error, testing::HasSubstr("Missing parameter is required")); | 169 EXPECT_THAT(error, testing::HasSubstr("Missing parameter is required")); |
| 128 EXPECT_FALSE(bad_message); | 170 EXPECT_FALSE(bad_message); |
| 129 ASSERT_FALSE(result.get()); | 171 ASSERT_FALSE(result.get()); |
| 130 } | 172 } |
| 131 | 173 |
| 132 TEST(DeclarativeContentActionTest, RequestContentScriptCSS) { | 174 TEST_F(RequestContentScriptTest, CSS) { |
| 133 TestExtensionEnvironment env; | |
| 134 | |
| 135 std::string error; | 175 std::string error; |
| 136 bool bad_message = false; | 176 bool bad_message = false; |
| 137 scoped_refptr<const ContentAction> result = ContentAction::Create( | 177 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 138 NULL, | 178 profile(), |
| 179 extension(), | |
| 139 *ParseJson( | 180 *ParseJson( |
| 140 "{\n" | 181 "{\n" |
| 141 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 182 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 142 " \"css\": [\"style.css\"]\n" | 183 " \"css\": [\"style.css\"]\n" |
| 143 "}"), | 184 "}"), |
| 144 &error, | 185 &error, |
| 145 &bad_message); | 186 &bad_message); |
| 146 EXPECT_EQ("", error); | 187 EXPECT_EQ("", error); |
| 147 EXPECT_FALSE(bad_message); | 188 EXPECT_FALSE(bad_message); |
| 148 ASSERT_TRUE(result.get()); | 189 ASSERT_TRUE(result.get()); |
| 149 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); | 190 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); |
| 150 } | 191 } |
| 151 | 192 |
| 152 TEST(DeclarativeContentActionTest, RequestContentScriptJS) { | 193 TEST_F(RequestContentScriptTest, JS) { |
| 153 TestExtensionEnvironment env; | |
| 154 | |
| 155 std::string error; | 194 std::string error; |
| 156 bool bad_message = false; | 195 bool bad_message = false; |
| 157 scoped_refptr<const ContentAction> result = ContentAction::Create( | 196 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 158 NULL, | 197 profile(), |
| 198 extension(), | |
| 159 *ParseJson( | 199 *ParseJson( |
| 160 "{\n" | 200 "{\n" |
| 161 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 201 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 162 " \"js\": [\"script.js\"]\n" | 202 " \"js\": [\"script.js\"]\n" |
| 163 "}"), | 203 "}"), |
| 164 &error, | 204 &error, |
| 165 &bad_message); | 205 &bad_message); |
| 166 EXPECT_EQ("", error); | 206 EXPECT_EQ("", error); |
| 167 EXPECT_FALSE(bad_message); | 207 EXPECT_FALSE(bad_message); |
| 168 ASSERT_TRUE(result.get()); | 208 ASSERT_TRUE(result.get()); |
| 169 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); | 209 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); |
| 170 } | 210 } |
| 171 | 211 |
| 172 TEST(DeclarativeContentActionTest, RequestContentScriptCSSBadType) { | 212 TEST_F(RequestContentScriptTest, CSSBadType) { |
| 173 TestExtensionEnvironment env; | |
| 174 | |
| 175 std::string error; | 213 std::string error; |
| 176 bool bad_message = false; | 214 bool bad_message = false; |
| 177 scoped_refptr<const ContentAction> result = ContentAction::Create( | 215 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 178 NULL, | 216 profile(), |
| 217 extension(), | |
| 179 *ParseJson( | 218 *ParseJson( |
| 180 "{\n" | 219 "{\n" |
| 181 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 220 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 182 " \"css\": \"style.css\"\n" | 221 " \"css\": \"style.css\"\n" |
| 183 "}"), | 222 "}"), |
| 184 &error, | 223 &error, |
| 185 &bad_message); | 224 &bad_message); |
| 186 EXPECT_TRUE(bad_message); | 225 EXPECT_TRUE(bad_message); |
| 187 ASSERT_FALSE(result.get()); | 226 ASSERT_FALSE(result.get()); |
| 188 } | 227 } |
| 189 | 228 |
| 190 TEST(DeclarativeContentActionTest, RequestContentScriptJSBadType) { | 229 TEST_F(RequestContentScriptTest, JSBadType) { |
| 191 TestExtensionEnvironment env; | |
| 192 | |
| 193 std::string error; | 230 std::string error; |
| 194 bool bad_message = false; | 231 bool bad_message = false; |
| 195 scoped_refptr<const ContentAction> result = ContentAction::Create( | 232 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 196 NULL, | 233 profile(), |
| 234 extension(), | |
| 197 *ParseJson( | 235 *ParseJson( |
| 198 "{\n" | 236 "{\n" |
| 199 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 237 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 200 " \"js\": \"script.js\"\n" | 238 " \"js\": \"script.js\"\n" |
| 201 "}"), | 239 "}"), |
| 202 &error, | 240 &error, |
| 203 &bad_message); | 241 &bad_message); |
| 204 EXPECT_TRUE(bad_message); | 242 EXPECT_TRUE(bad_message); |
| 205 ASSERT_FALSE(result.get()); | 243 ASSERT_FALSE(result.get()); |
| 206 } | 244 } |
| 207 | 245 |
| 208 TEST(DeclarativeContentActionTest, RequestContentScriptAllFrames) { | 246 TEST_F(RequestContentScriptTest, AllFrames) { |
| 209 TestExtensionEnvironment env; | |
| 210 | |
| 211 std::string error; | 247 std::string error; |
| 212 bool bad_message = false; | 248 bool bad_message = false; |
| 213 scoped_refptr<const ContentAction> result = ContentAction::Create( | 249 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 214 NULL, | 250 profile(), |
| 251 extension(), | |
| 215 *ParseJson( | 252 *ParseJson( |
| 216 "{\n" | 253 "{\n" |
| 217 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 254 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 218 " \"js\": [\"script.js\"],\n" | 255 " \"js\": [\"script.js\"],\n" |
| 219 " \"allFrames\": true\n" | 256 " \"allFrames\": true\n" |
| 220 "}"), | 257 "}"), |
| 221 &error, | 258 &error, |
| 222 &bad_message); | 259 &bad_message); |
| 223 EXPECT_EQ("", error); | 260 EXPECT_EQ("", error); |
| 224 EXPECT_FALSE(bad_message); | 261 EXPECT_FALSE(bad_message); |
| 225 ASSERT_TRUE(result.get()); | 262 ASSERT_TRUE(result.get()); |
| 226 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); | 263 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); |
| 227 } | 264 } |
| 228 | 265 |
| 229 TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlank) { | 266 TEST_F(RequestContentScriptTest, MatchAboutBlank) { |
| 230 TestExtensionEnvironment env; | |
| 231 | |
| 232 std::string error; | 267 std::string error; |
| 233 bool bad_message = false; | 268 bool bad_message = false; |
| 234 scoped_refptr<const ContentAction> result = ContentAction::Create( | 269 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 235 NULL, | 270 profile(), |
| 271 extension(), | |
| 236 *ParseJson( | 272 *ParseJson( |
| 237 "{\n" | 273 "{\n" |
| 238 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 274 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 239 " \"js\": [\"script.js\"],\n" | 275 " \"js\": [\"script.js\"],\n" |
| 240 " \"matchAboutBlank\": true\n" | 276 " \"matchAboutBlank\": true\n" |
| 241 "}"), | 277 "}"), |
| 242 &error, | 278 &error, |
| 243 &bad_message); | 279 &bad_message); |
| 244 EXPECT_EQ("", error); | 280 EXPECT_EQ("", error); |
| 245 EXPECT_FALSE(bad_message); | 281 EXPECT_FALSE(bad_message); |
| 246 ASSERT_TRUE(result.get()); | 282 ASSERT_TRUE(result.get()); |
| 247 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); | 283 EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType()); |
| 248 } | 284 } |
| 249 | 285 |
| 250 TEST(DeclarativeContentActionTest, RequestContentScriptAllFramesBadType) { | 286 TEST_F(RequestContentScriptTest, AllFramesBadType) { |
| 251 TestExtensionEnvironment env; | |
| 252 | |
| 253 std::string error; | 287 std::string error; |
| 254 bool bad_message = false; | 288 bool bad_message = false; |
| 255 scoped_refptr<const ContentAction> result = ContentAction::Create( | 289 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 256 NULL, | 290 profile(), |
| 291 extension(), | |
| 257 *ParseJson( | 292 *ParseJson( |
| 258 "{\n" | 293 "{\n" |
| 259 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 294 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 260 " \"js\": [\"script.js\"],\n" | 295 " \"js\": [\"script.js\"],\n" |
| 261 " \"allFrames\": null\n" | 296 " \"allFrames\": null\n" |
| 262 "}"), | 297 "}"), |
| 263 &error, | 298 &error, |
| 264 &bad_message); | 299 &bad_message); |
| 265 EXPECT_TRUE(bad_message); | 300 EXPECT_TRUE(bad_message); |
| 266 ASSERT_FALSE(result.get()); | 301 ASSERT_FALSE(result.get()); |
| 267 } | 302 } |
| 268 | 303 |
| 269 TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlankBadType) { | 304 TEST_F(RequestContentScriptTest, MatchAboutBlankBadType) { |
| 270 TestExtensionEnvironment env; | |
| 271 | |
| 272 std::string error; | 305 std::string error; |
| 273 bool bad_message = false; | 306 bool bad_message = false; |
| 274 scoped_refptr<const ContentAction> result = ContentAction::Create( | 307 scoped_refptr<const ContentAction> result = ContentAction::Create( |
| 275 NULL, | 308 profile(), |
| 309 extension(), | |
| 276 *ParseJson( | 310 *ParseJson( |
| 277 "{\n" | 311 "{\n" |
| 278 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 312 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 279 " \"js\": [\"script.js\"],\n" | 313 " \"js\": [\"script.js\"],\n" |
| 280 " \"matchAboutBlank\": null\n" | 314 " \"matchAboutBlank\": null\n" |
| 281 "}"), | 315 "}"), |
| 282 &error, | 316 &error, |
| 283 &bad_message); | 317 &bad_message); |
| 284 EXPECT_TRUE(bad_message); | 318 EXPECT_TRUE(bad_message); |
| 285 ASSERT_FALSE(result.get()); | 319 ASSERT_FALSE(result.get()); |
| 286 } | 320 } |
| 287 | 321 |
| 288 } // namespace | 322 } // namespace |
| 289 } // namespace extensions | 323 } // namespace extensions |
| OLD | NEW |