chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/api/extension_action/script_badge_manifest_unittest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« chrome/browser/extensions/tab_helper.h ('K') | « chrome/common/extensions/api/extension_action/script_badge_handler.cc ('k') | chrome/common/extensions/api/extension_api_unittest.cc » ('j') | chrome/common/extensions/extension.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc

diff --git a/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc

index 98b5f17bcc2e9a5291ed02a62aefa5f6dbea3521..2289a6f5ac9e657e8c3aca99423844305b54abb0 100644

--- a/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc

+++ b/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc

@@ -10,6 +10,7 @@

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

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

#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

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

#include "testing/gmock/include/gmock/gmock.h"

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

@@ -19,9 +20,9 @@ namespace extensions {

namespace {

-std::vector<Extension::InstallWarning> StripMissingFlagWarning(

- const std::vector<Extension::InstallWarning>& install_warnings) {

- std::vector<Extension::InstallWarning> result;

+std::vector<InstallWarning> StripMissingFlagWarning(

+ const InstallWarning::Vector& install_warnings) {

+ InstallWarning::Vector result;

for (size_t i = 0; i < install_warnings.size(); ++i) {

if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag)

result.push_back(install_warnings[i]);

@@ -103,11 +104,11 @@ TEST_F(ScriptBadgeManifestTest, ScriptBadgeExplicitTitleAndIconsIgnored) {

EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()),

testing::ElementsAre(

- Extension::InstallWarning(

- Extension::InstallWarning::FORMAT_TEXT,

+ InstallWarning(

+ InstallWarning::FORMAT_TEXT,

errors::kScriptBadgeTitleIgnored),

- Extension::InstallWarning(

- Extension::InstallWarning::FORMAT_TEXT,

+ InstallWarning(

+ InstallWarning::FORMAT_TEXT,

errors::kScriptBadgeIconIgnored)));

const ExtensionIconSet& default_icon =