chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc - Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 9 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

« no previous file with comments | « chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc ('k') | chrome/common/extensions/manifest_handlers/ui_overrides_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

index 1f27354a79a4f16c1897f5aabeec0ef56b1ad59c..b884ff945167edea58aa9a3e6b27077530ee4dda 100644

--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

@@ -8,6 +8,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/extensions/manifest_url_handler.h"

+#include "extensions/common/error_utils.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest_constants.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -120,7 +121,9 @@ TEST_F(OverrideSettingsTest, ParseBrokenManifest) {

#if defined(OS_WIN)

EXPECT_FALSE(extension);

EXPECT_EQ(

- std::string(extensions::manifest_errors::kInvalidEmptySettingsOverrides),

+ extensions::ErrorUtils::FormatErrorMessage(

+ extensions::manifest_errors::kInvalidEmptyDictionary,

+ extensions::manifest_keys::kSettingsOverride),

error);

#else

EXPECT_TRUE(extension);