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

Side by Side Diff: chrome/common/extensions/api/extension_api_unittest.cc

Issue 15091002: Lazily load API schemas from resource files and convert all APIs to features (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more comments and fixed tests Created 7 years, 6 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/api/extension_api.h" 5 #include "chrome/common/extensions/api/extension_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_manifest_constants.h" 21 #include "chrome/common/extensions/extension_manifest_constants.h"
22 #include "chrome/common/extensions/features/api_feature.h" 22 #include "chrome/common/extensions/features/api_feature.h"
23 #include "chrome/common/extensions/features/base_feature_provider.h" 23 #include "chrome/common/extensions/features/base_feature_provider.h"
24 #include "chrome/common/extensions/features/simple_feature.h" 24 #include "chrome/common/extensions/features/simple_feature.h"
25 #include "chrome/common/extensions/manifest.h" 25 #include "chrome/common/extensions/manifest.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 27
28 namespace extensions { 28 namespace extensions {
29 namespace {
30 29
31 SimpleFeature* CreateAPIFeature() { 30 SimpleFeature* CreateAPIFeature() {
32 return new APIFeature(); 31 return new APIFeature();
33 } 32 }
34 33
35 TEST(ExtensionAPITest, Creation) { 34 TEST(ExtensionAPITest, Creation) {
36 ExtensionAPI* shared_instance = ExtensionAPI::GetSharedInstance(); 35 ExtensionAPI* shared_instance = ExtensionAPI::GetSharedInstance();
37 EXPECT_EQ(shared_instance, ExtensionAPI::GetSharedInstance()); 36 EXPECT_EQ(shared_instance, ExtensionAPI::GetSharedInstance());
38 37
39 scoped_ptr<ExtensionAPI> new_instance( 38 scoped_ptr<ExtensionAPI> new_instance(
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 } 83 }
85 84
86 TEST(ExtensionAPITest, IsPrivileged) { 85 TEST(ExtensionAPITest, IsPrivileged) {
87 scoped_ptr<ExtensionAPI> extension_api( 86 scoped_ptr<ExtensionAPI> extension_api(
88 ExtensionAPI::CreateWithDefaultConfiguration()); 87 ExtensionAPI::CreateWithDefaultConfiguration());
89 88
90 EXPECT_FALSE(extension_api->IsPrivileged("runtime.connect")); 89 EXPECT_FALSE(extension_api->IsPrivileged("runtime.connect"));
91 EXPECT_FALSE(extension_api->IsPrivileged("runtime.onConnect")); 90 EXPECT_FALSE(extension_api->IsPrivileged("runtime.onConnect"));
92 EXPECT_FALSE(extension_api->IsPrivileged("runtime.lastError")); 91 EXPECT_FALSE(extension_api->IsPrivileged("runtime.lastError"));
93 92
94 // Default unknown names to privileged for paranoia's sake.
95 EXPECT_TRUE(extension_api->IsPrivileged(std::string()));
96 EXPECT_TRUE(extension_api->IsPrivileged("<unknown-namespace>"));
97 EXPECT_TRUE(extension_api->IsPrivileged("extension.<unknown-member>"));
98
99 // Exists, but privileged. 93 // Exists, but privileged.
100 EXPECT_TRUE(extension_api->IsPrivileged("extension.getViews")); 94 EXPECT_TRUE(extension_api->IsPrivileged("extension.getViews"));
101 EXPECT_TRUE(extension_api->IsPrivileged("history.search")); 95 EXPECT_TRUE(extension_api->IsPrivileged("history.search"));
102 96
103 // Whole APIs that are unprivileged. 97 // Whole APIs that are unprivileged.
104 EXPECT_FALSE(extension_api->IsPrivileged("app.getDetails")); 98 EXPECT_FALSE(extension_api->IsPrivileged("app.getDetails"));
105 EXPECT_FALSE(extension_api->IsPrivileged("app.isInstalled")); 99 EXPECT_FALSE(extension_api->IsPrivileged("app.isInstalled"));
106 EXPECT_FALSE(extension_api->IsPrivileged("storage.local")); 100 EXPECT_FALSE(extension_api->IsPrivileged("storage.local"));
107 EXPECT_FALSE(extension_api->IsPrivileged("storage.local.onChanged")); 101 EXPECT_FALSE(extension_api->IsPrivileged("storage.local.onChanged"));
108 EXPECT_FALSE(extension_api->IsPrivileged("storage.local.set")); 102 EXPECT_FALSE(extension_api->IsPrivileged("storage.local.set"));
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); 135 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature);
142 136
143 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { 137 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
144 ExtensionAPI api; 138 ExtensionAPI api;
145 api.RegisterDependencyProvider("api", &api_feature_provider); 139 api.RegisterDependencyProvider("api", &api_feature_provider);
146 EXPECT_EQ(test_data[i].expect_is_privilged, 140 EXPECT_EQ(test_data[i].expect_is_privilged,
147 api.IsPrivileged(test_data[i].api_full_name)) << i; 141 api.IsPrivileged(test_data[i].api_full_name)) << i;
148 } 142 }
149 } 143 }
150 144
151 TEST(ExtensionAPI, APIFeatures) { 145 TEST(ExtensionAPITest, APIFeatures) {
152 struct { 146 struct {
153 std::string api_full_name; 147 std::string api_full_name;
154 bool expect_is_available; 148 bool expect_is_available;
155 Feature::Context context; 149 Feature::Context context;
156 GURL url; 150 GURL url;
157 } test_data[] = { 151 } test_data[] = {
158 { "test1", false, Feature::WEB_PAGE_CONTEXT, GURL() }, 152 { "test1", false, Feature::WEB_PAGE_CONTEXT, GURL() },
159 { "test1", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() }, 153 { "test1", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
160 { "test1", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() }, 154 { "test1", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
161 { "test1", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() }, 155 { "test1", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
(...skipping 17 matching lines...) Expand all
179 { "test5", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") }, 173 { "test5", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
180 { "test5", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") }, 174 { "test5", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
181 { "test5.blah", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") }, 175 { "test5.blah", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
182 { "test5.blah", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") }, 176 { "test5.blah", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
183 { "test6", false, Feature::BLESSED_EXTENSION_CONTEXT, GURL() }, 177 { "test6", false, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
184 { "test6.foo", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() }, 178 { "test6.foo", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
185 { "test7", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") }, 179 { "test7", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
186 { "test7.foo", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") }, 180 { "test7.foo", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
187 { "test7.foo", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") }, 181 { "test7.foo", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
188 { "test7.bar", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") }, 182 { "test7.bar", false, Feature::WEB_PAGE_CONTEXT, GURL("http://bar.com") },
189 { "test7.bar", false, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") } 183 { "test7.bar", false, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
184
185 // Test parent/child.
186 { "parent1", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
187 { "parent1", false, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
188 { "child1", false, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
189 { "child1", true, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
190 { "child2", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
191 { "child2", false, Feature::WEB_PAGE_CONTEXT, GURL("http://foo.com") },
192 { "parent2", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
193 { "parent2", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
194 { "parent2", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
195 { "child3", false, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
196 { "child3", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
197 { "child3", false, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
198 { "child.child", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
199 { "child.child", false, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
200 { "child.child", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() }
190 }; 201 };
191 202
192 base::FilePath api_features_path; 203 base::FilePath api_features_path;
193 PathService::Get(chrome::DIR_TEST_DATA, &api_features_path); 204 PathService::Get(chrome::DIR_TEST_DATA, &api_features_path);
194 api_features_path = api_features_path.AppendASCII("extensions") 205 api_features_path = api_features_path.AppendASCII("extensions")
195 .AppendASCII("extension_api_unittest") 206 .AppendASCII("extension_api_unittest")
196 .AppendASCII("api_features.json"); 207 .AppendASCII("api_features.json");
197 208
198 std::string api_features_str; 209 std::string api_features_str;
199 ASSERT_TRUE(file_util::ReadFileToString( 210 ASSERT_TRUE(file_util::ReadFileToString(
200 api_features_path, &api_features_str)) << "api_features.json"; 211 api_features_path, &api_features_str)) << "api_features.json";
201 212
202 scoped_ptr<base::DictionaryValue> value(static_cast<DictionaryValue*>( 213 scoped_ptr<base::DictionaryValue> value(static_cast<DictionaryValue*>(
203 base::JSONReader::Read(api_features_str))); 214 base::JSONReader::Read(api_features_str)));
204 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); 215 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature);
205 216
206 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { 217 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
207 ExtensionAPI api; 218 ExtensionAPI api;
208 api.RegisterDependencyProvider("api", &api_feature_provider); 219 api.RegisterDependencyProvider("api", &api_feature_provider);
209 for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd(); 220 for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd();
210 iter.Advance()) { 221 iter.Advance()) {
211 if (iter.key().find(".") == std::string::npos) 222 if (iter.key().find(".") == std::string::npos)
212 api.RegisterSchema(iter.key(), ""); 223 api.RegisterSchemaResource(iter.key(), 0);
213 } 224 }
214 225
215 EXPECT_EQ(test_data[i].expect_is_available, 226 EXPECT_EQ(test_data[i].expect_is_available,
216 api.IsAvailable(test_data[i].api_full_name, 227 api.IsAvailable(test_data[i].api_full_name,
217 NULL, 228 NULL,
218 test_data[i].context, 229 test_data[i].context,
219 test_data[i].url).is_available()) << i; 230 test_data[i].url).is_available()) << i;
220 } 231 }
221 } 232 }
222 233
223 TEST(ExtensionAPI, IsAnyFeatureAvailableToContext) { 234 TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) {
224 struct { 235 struct {
225 std::string api_full_name; 236 std::string api_full_name;
226 bool expect_is_available; 237 bool expect_is_available;
227 Feature::Context context; 238 Feature::Context context;
228 GURL url; 239 GURL url;
229 } test_data[] = { 240 } test_data[] = {
230 { "test1", false, Feature::WEB_PAGE_CONTEXT, GURL() }, 241 { "test1", false, Feature::WEB_PAGE_CONTEXT, GURL() },
231 { "test1", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() }, 242 { "test1", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
232 { "test2", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() }, 243 { "test2", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
233 { "test2", true, Feature::WEB_PAGE_CONTEXT, GURL("http://google.com") }, 244 { "test2", true, Feature::WEB_PAGE_CONTEXT, GURL("http://google.com") },
(...skipping 20 matching lines...) Expand all
254 scoped_ptr<base::DictionaryValue> value(static_cast<DictionaryValue*>( 265 scoped_ptr<base::DictionaryValue> value(static_cast<DictionaryValue*>(
255 base::JSONReader::Read(api_features_str))); 266 base::JSONReader::Read(api_features_str)));
256 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); 267 BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature);
257 268
258 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { 269 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
259 ExtensionAPI api; 270 ExtensionAPI api;
260 api.RegisterDependencyProvider("api", &api_feature_provider); 271 api.RegisterDependencyProvider("api", &api_feature_provider);
261 for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd(); 272 for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd();
262 iter.Advance()) { 273 iter.Advance()) {
263 if (iter.key().find(".") == std::string::npos) 274 if (iter.key().find(".") == std::string::npos)
264 api.RegisterSchema(iter.key(), ""); 275 api.RegisterSchemaResource(iter.key(), 0);
265 } 276 }
266 277
267 EXPECT_EQ(test_data[i].expect_is_available, 278 EXPECT_EQ(test_data[i].expect_is_available,
268 api.IsAnyFeatureAvailableToContext(test_data[i].api_full_name, 279 api.IsAnyFeatureAvailableToContext(test_data[i].api_full_name,
269 test_data[i].context, 280 test_data[i].context,
270 test_data[i].url)) << i; 281 test_data[i].url)) << i;
271 } 282 }
272 } 283 }
273 284
274 TEST(ExtensionAPITest, LazyGetSchema) { 285 TEST(ExtensionAPITest, LazyGetSchema) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 permissions.insert("storage"); 343 permissions.insert("storage");
333 permissions.insert("history"); 344 permissions.insert("history");
334 extension = CreateExtensionWithPermissions(permissions); 345 extension = CreateExtensionWithPermissions(permissions);
335 } 346 }
336 347
337 scoped_ptr<ExtensionAPI> extension_api( 348 scoped_ptr<ExtensionAPI> extension_api(
338 ExtensionAPI::CreateWithDefaultConfiguration()); 349 ExtensionAPI::CreateWithDefaultConfiguration());
339 350
340 // "runtime" has privileged parts that should not be accessed by content 351 // "runtime" has privileged parts that should not be accessed by content
341 // scripts. 352 // scripts.
342 EXPECT_FALSE(extension_api->IsAvailable("runtime", 353 EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
343 extension.get(), 354 "runtime.getBackgroundPage",
344 Feature::CONTENT_SCRIPT_CONTEXT, 355 Feature::CONTENT_SCRIPT_CONTEXT,
345 GURL()).is_available()); 356 GURL()));
346 EXPECT_FALSE(extension_api->IsAvailable("runtime.sendNativeMessage", 357 EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
347 extension.get(), 358 "runtime.sendNativeMessage",
348 Feature::CONTENT_SCRIPT_CONTEXT, 359 Feature::CONTENT_SCRIPT_CONTEXT,
349 GURL()).is_available()); 360 GURL()));
350 // "runtime" also has unprivileged parts. 361 // "runtime" also has unprivileged parts.
351 EXPECT_TRUE(extension_api->IsAvailable("runtime.sendMessage", 362 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
352 extension.get(), 363 "runtime.sendMessage",
353 Feature::CONTENT_SCRIPT_CONTEXT, 364 Feature::CONTENT_SCRIPT_CONTEXT,
354 GURL()).is_available()); 365 GURL()));
355 EXPECT_TRUE(extension_api->IsAvailable("runtime.id", 366 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
356 extension.get(), 367 "runtime.id",
357 Feature::CONTENT_SCRIPT_CONTEXT, 368 Feature::CONTENT_SCRIPT_CONTEXT,
358 GURL()).is_available()); 369 GURL()));
359 370
360 // "storage" is completely unprivileged. 371 // "storage" is completely unprivileged.
361 EXPECT_TRUE(extension_api->IsAvailable("storage", 372 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
362 extension.get(), 373 "storage",
363 Feature::BLESSED_EXTENSION_CONTEXT, 374 Feature::BLESSED_EXTENSION_CONTEXT,
364 GURL()).is_available()); 375 GURL()));
365 EXPECT_TRUE(extension_api->IsAvailable("storage", 376 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
366 extension.get(), 377 "storage",
367 Feature::UNBLESSED_EXTENSION_CONTEXT, 378 Feature::UNBLESSED_EXTENSION_CONTEXT,
368 GURL()).is_available()); 379 GURL()));
369 EXPECT_TRUE(extension_api->IsAvailable("storage", 380 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
370 extension.get(), 381 "storage",
371 Feature::CONTENT_SCRIPT_CONTEXT, 382 Feature::CONTENT_SCRIPT_CONTEXT,
372 GURL()).is_available()); 383 GURL()));
373 384
374 // "extension" is partially unprivileged. 385 // "extension" is partially unprivileged.
375 EXPECT_TRUE(extension_api->IsAvailable("extension", 386 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
376 extension.get(), 387 "extension",
377 Feature::BLESSED_EXTENSION_CONTEXT, 388 Feature::BLESSED_EXTENSION_CONTEXT,
378 GURL()).is_available()); 389 GURL()));
379 EXPECT_TRUE(extension_api->IsAvailable("extension", 390 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
380 extension.get(), 391 "extension",
381 Feature::UNBLESSED_EXTENSION_CONTEXT, 392 Feature::UNBLESSED_EXTENSION_CONTEXT,
382 GURL()).is_available()); 393 GURL()));
383 EXPECT_TRUE(extension_api->IsAvailable("extension", 394 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
384 extension.get(), 395 "extension",
385 Feature::CONTENT_SCRIPT_CONTEXT, 396 Feature::CONTENT_SCRIPT_CONTEXT,
386 GURL()).is_available()); 397 GURL()));
387 398
388 // "history" is entirely privileged. 399 // "history" is entirely privileged.
389 EXPECT_TRUE(extension_api->IsAvailable("history", 400 EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
390 extension.get(), 401 "history",
391 Feature::BLESSED_EXTENSION_CONTEXT, 402 Feature::BLESSED_EXTENSION_CONTEXT,
392 GURL()).is_available()); 403 GURL()));
393 EXPECT_FALSE(extension_api->IsAvailable("history", 404 EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
394 extension.get(), 405 "history",
395 Feature::UNBLESSED_EXTENSION_CONTEXT, 406 Feature::UNBLESSED_EXTENSION_CONTEXT,
396 GURL()).is_available()); 407 GURL()));
397 EXPECT_FALSE(extension_api->IsAvailable("history", 408 EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
398 extension.get(), 409 "history",
399 Feature::CONTENT_SCRIPT_CONTEXT, 410 Feature::CONTENT_SCRIPT_CONTEXT,
400 GURL()).is_available()); 411 GURL()));
401 } 412 }
402 413
403 scoped_refptr<Extension> CreateHostedApp() { 414 scoped_refptr<Extension> CreateHostedApp() {
404 base::DictionaryValue values; 415 base::DictionaryValue values;
405 values.SetString(extension_manifest_keys::kName, "test"); 416 values.SetString(extension_manifest_keys::kName, "test");
406 values.SetString(extension_manifest_keys::kVersion, "0.1"); 417 values.SetString(extension_manifest_keys::kVersion, "0.1");
407 values.Set(extension_manifest_keys::kWebURLs, new base::ListValue()); 418 values.Set(extension_manifest_keys::kWebURLs, new base::ListValue());
408 values.SetString(extension_manifest_keys::kLaunchWebURL, 419 values.SetString(extension_manifest_keys::kLaunchWebURL,
409 "http://www.example.com"); 420 "http://www.example.com");
410 421
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 PathService::Get(chrome::DIR_TEST_DATA, &manifest_path); 626 PathService::Get(chrome::DIR_TEST_DATA, &manifest_path);
616 manifest_path = manifest_path.AppendASCII("extensions") 627 manifest_path = manifest_path.AppendASCII("extensions")
617 .AppendASCII("extension_api_unittest") 628 .AppendASCII("extension_api_unittest")
618 .AppendASCII("types_have_namespace.json"); 629 .AppendASCII("types_have_namespace.json");
619 630
620 std::string manifest_str; 631 std::string manifest_str;
621 ASSERT_TRUE(file_util::ReadFileToString(manifest_path, &manifest_str)) 632 ASSERT_TRUE(file_util::ReadFileToString(manifest_path, &manifest_str))
622 << "Failed to load: " << manifest_path.value(); 633 << "Failed to load: " << manifest_path.value();
623 634
624 ExtensionAPI api; 635 ExtensionAPI api;
625 api.RegisterSchema("test.foo", manifest_str); 636 api.RegisterSchemaResource("test.foo", 0);
637 api.LoadSchema("test.foo", manifest_str);
626 638
627 const base::DictionaryValue* schema = api.GetSchema("test.foo"); 639 const base::DictionaryValue* schema = api.GetSchema("test.foo");
628 640
629 const base::DictionaryValue* dict; 641 const base::DictionaryValue* dict;
630 const base::DictionaryValue* sub_dict; 642 const base::DictionaryValue* sub_dict;
631 std::string type; 643 std::string type;
632 644
633 GetDictionaryFromList(schema, "types", 0, &dict); 645 GetDictionaryFromList(schema, "types", 0, &dict);
634 EXPECT_TRUE(dict->GetString("id", &type)); 646 EXPECT_TRUE(dict->GetString("id", &type));
635 EXPECT_EQ("test.foo.TestType", type); 647 EXPECT_EQ("test.foo.TestType", type);
(...skipping 26 matching lines...) Expand all
662 674
663 GetDictionaryFromList(schema, "events", 0, &dict); 675 GetDictionaryFromList(schema, "events", 0, &dict);
664 GetDictionaryFromList(dict, "parameters", 0, &sub_dict); 676 GetDictionaryFromList(dict, "parameters", 0, &sub_dict);
665 EXPECT_TRUE(sub_dict->GetString("$ref", &type)); 677 EXPECT_TRUE(sub_dict->GetString("$ref", &type));
666 EXPECT_EQ("test.foo.TestType", type); 678 EXPECT_EQ("test.foo.TestType", type);
667 GetDictionaryFromList(dict, "parameters", 1, &sub_dict); 679 GetDictionaryFromList(dict, "parameters", 1, &sub_dict);
668 EXPECT_TRUE(sub_dict->GetString("$ref", &type)); 680 EXPECT_TRUE(sub_dict->GetString("$ref", &type));
669 EXPECT_EQ("fully.qualified.Type", type); 681 EXPECT_EQ("fully.qualified.Type", type);
670 } 682 }
671 683
672 } // namespace
673 } // namespace extensions 684 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698