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

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

Issue 10949017: Allow extensions which can run without NPAPI to run under Windows 8 Metro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch cross-origin-XHR all-URLs test for ChromeOS. Created 8 years, 2 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 "chrome/common/extensions/extension_error_utils.h" 7 #include "chrome/common/extensions/extension_error_utils.h"
8 #include "chrome/common/extensions/extension_manifest_constants.h" 8 #include "chrome/common/extensions/extension_manifest_constants.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 // When an npapi plugin is present, the default of the "npapi" requirement 61 // When an npapi plugin is present, the default of the "npapi" requirement
62 // changes. 62 // changes.
63 TEST_F(ExtensionManifestTest, RequirementsNpapiDefault) { 63 TEST_F(ExtensionManifestTest, RequirementsNpapiDefault) {
64 scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess( 64 scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
65 "requirements_npapi_empty.json")); 65 "requirements_npapi_empty.json"));
66 ASSERT_TRUE(extension.get()); 66 ASSERT_TRUE(extension.get());
67 EXPECT_EQ(extension->requirements().webgl, false); 67 EXPECT_EQ(extension->requirements().webgl, false);
68 EXPECT_EQ(extension->requirements().css3d, false); 68 EXPECT_EQ(extension->requirements().css3d, false);
69 #if defined(OS_CHROMEOS) 69 EXPECT_EQ(extension->requirements().npapi, true);
70
71 extension = LoadAndExpectSuccess(
72 "requirements_npapi_empty_plugins_empty.json");
73 ASSERT_TRUE(extension.get());
74 EXPECT_EQ(extension->requirements().webgl, false);
75 EXPECT_EQ(extension->requirements().css3d, false);
70 EXPECT_EQ(extension->requirements().npapi, false); 76 EXPECT_EQ(extension->requirements().npapi, false);
71 #else
72 EXPECT_EQ(extension->requirements().npapi, true);
73 #endif // defined(OS_CHROMEOS)
74 77
75 extension = LoadAndExpectSuccess("requirements_npapi.json"); 78 extension = LoadAndExpectSuccess("requirements_npapi.json");
76 ASSERT_TRUE(extension.get()); 79 ASSERT_TRUE(extension.get());
77 EXPECT_EQ(extension->requirements().webgl, false); 80 EXPECT_EQ(extension->requirements().webgl, false);
78 EXPECT_EQ(extension->requirements().css3d, false); 81 EXPECT_EQ(extension->requirements().css3d, false);
79 EXPECT_EQ(extension->requirements().npapi, false); 82 EXPECT_EQ(extension->requirements().npapi, false);
83
84 extension = LoadAndExpectSuccess("requirements_npapi_plugins_empty.json");
85 ASSERT_TRUE(extension.get());
86 EXPECT_EQ(extension->requirements().webgl, false);
87 EXPECT_EQ(extension->requirements().css3d, false);
88 EXPECT_EQ(extension->requirements().npapi, true);
80 } 89 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/test/data/extensions/api_test/cross_origin_xhr/all_urls/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698