chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc - Issue 1257633002: Componentize VersionInfo.

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/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

Issue 1257633002: Componentize VersionInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Convert version_info::Channel to a "class enum" Created 5 years, 5 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/browser/extensions/active_tab_unittest.cc ('k') | chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

index 70e0e6baa2ee36794c85f009eb76c7ac5c1db156..2ea5e6943ff6b4584f3a9939f02141c2d619548d 100644

--- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

+++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

@@ -206,10 +206,10 @@ TEST_F(RulesRegistryWithCacheTest, GetAllRules) {

EXPECT_EQ(2u, gotten_rules.size());

ASSERT_TRUE(gotten_rules[0]->id.get());

ASSERT_TRUE(gotten_rules[1]->id.get());

- EXPECT_TRUE( (kRuleId == *(gotten_rules[0]->id) &&

- kRule2Id == *(gotten_rules[1]->id)) ||

- (kRuleId == *(gotten_rules[1]->id) &&

- kRule2Id == *(gotten_rules[0]->id)) );

+ EXPECT_TRUE((kRuleId == *(gotten_rules[0]->id) &&

+ kRule2Id == *(gotten_rules[1]->id)) ||

+ (kRuleId == *(gotten_rules[1]->id) &&

+ kRule2Id == *(gotten_rules[0]->id)) );

}

TEST_F(RulesRegistryWithCacheTest, OnExtensionUninstalled) {

@@ -328,7 +328,7 @@ TEST_F(RulesRegistryWithCacheTest, RulesPreservedAcrossRestart) {

// TODO(vabr): Once some API using declarative rules enters the stable

// channel, make sure to use that API here, and remove |channel|.

- ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_UNKNOWN);

+ ScopedCurrentChannel channel(version_info::Channel::UNKNOWN);

ExtensionService* extension_service = env_.GetExtensionService();