chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc - Issue 1443033004: Supervised User whitelists: update to json format v2

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/component_updater/supervised_user_whitelist_installer_unittest.cc

Issue 1443033004: Supervised User whitelists: update to json format v2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: title Created 5 years, 1 month 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/component_updater/supervised_user_whitelist_installer.cc ('K') | « chrome/browser/component_updater/supervised_user_whitelist_installer.cc ('k') | chrome/browser/supervised_user/supervised_user_service_unittest.cc » ('j') | chrome/browser/supervised_user/supervised_user_site_list.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc

diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc

index 1222b32a139704429b662a9314cb5cd1f8ebb12c..342f7e3b3933acba83a89cc022d144a4593eda89 100644

--- a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc

+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc

@@ -163,6 +163,7 @@ class WhitelistLoadObserver {

private:

void OnWhitelistReady(const std::string& crx_id,

+ const base::string16& title,

const base::FilePath& whitelist_path) {

EXPECT_EQ(base::FilePath::StringType(), whitelist_path_.value());

whitelist_path_ = whitelist_path;

@@ -208,8 +209,8 @@ class SupervisedUserWhitelistInstallerTest : public testing::Test {

scoped_ptr<base::DictionaryValue> whitelist_dict(

new base::DictionaryValue);

- whitelist_dict->SetString("file", kWhitelistFile);

- manifest_.Set("whitelist", whitelist_dict.release());

+ whitelist_dict->SetString("sites", kWhitelistFile);

+ manifest_.Set("whitelisted_content", whitelist_dict.release());

manifest_.SetString("version", kVersion);

scoped_ptr<base::DictionaryValue> crx_dict(new base::DictionaryValue);