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

Unified Diff: chrome/common/extensions/extension_manifests_unittest.cc

Issue 6378009: Only allow extension pages to be displayed in the sidebar to be consistent... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/extension_manifests_unittest.cc
===================================================================
--- chrome/common/extensions/extension_manifests_unittest.cc (revision 72219)
+++ chrome/common/extensions/extension_manifests_unittest.cc (working copy)
@@ -288,14 +288,12 @@
errors::kInvalidSidebarDefaultIconPath);
LoadAndExpectError("sidebar_icon_invalid_type.json",
errors::kInvalidSidebarDefaultIconPath);
+ LoadAndExpectError("sidebar_page_empty.json",
+ errors::kInvalidSidebarDefaultPage);
+ LoadAndExpectError("sidebar_page_invalid_type.json",
+ errors::kInvalidSidebarDefaultPage);
LoadAndExpectError("sidebar_title_invalid_type.json",
errors::kInvalidSidebarDefaultTitle);
- LoadAndExpectError("sidebar_url_invalid.json",
- errors::kInvalidSidebarDefaultUrl);
- LoadAndExpectError("sidebar_url_invalid_type.json",
- errors::kInvalidSidebarDefaultUrl);
- LoadAndExpectError("sidebar_url_no_permissions.json",
- extension_manifest_errors::kCannotAccessPage);
scoped_refptr<Extension> extension(LoadAndExpectSuccess("sidebar.json"));
ASSERT_TRUE(extension->sidebar_defaults() != NULL);
@@ -304,13 +302,8 @@
EXPECT_EQ(extension->sidebar_defaults()->default_icon_path(),
"icon.png");
EXPECT_EQ(extension->url().spec() + "sidebar.html",
- extension->sidebar_defaults()->default_url().spec());
+ extension->sidebar_defaults()->default_page().spec());
- scoped_refptr<Extension> extension_external_url(
- LoadAndExpectSuccess("sidebar_external_url.json"));
- EXPECT_EQ("http://sidebar.url/sidebar.html",
- extension_external_url->sidebar_defaults()->default_url().spec());
-
*CommandLine::ForCurrentProcess() = old_command_line;
}
« no previous file with comments | « chrome/common/extensions/extension_file_util.cc ('k') | chrome/common/extensions/extension_sidebar_defaults.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698