components/supervised_user_error_page/supervised_user_error_page_unittest.cc - Issue 2712513004: Use a qualified path for grit-generated headers in components/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: components/supervised_user_error_page/supervised_user_error_page_unittest.cc

Issue 2712513004: Use a qualified path for grit-generated headers in components/ (Closed)

Patch Set: res Created 3 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

	5 #include "components/supervised_user_error_page/supervised_user_error_page.h"

5 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"
	sdefresne 2017/02/23 11:34:53 nit: can you add a blank line here? nit: can you add a blank line here? Nico 2017/02/23 16:57:53 Done. Show quoted text On 2017/02/23 11:34:53, sdefresne wrote: > nit: can you add a blank line here? Done.
6 #include "components/supervised_user_error_page/supervised_user_error_page.h"	7 #include "components/grit/components_resources.h"

7 #include "grit/components_resources.h"	8 #include "components/strings/grit/components_strings.h"

8 #include "grit/components_strings.h"

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

10 #include "testing/gtest/include/gtest/gtest-param-test.h"	10 #include "testing/gtest/include/gtest/gtest-param-test.h"

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

12 #include "ui/base/l10n/l10n_util.h"	12 #include "ui/base/l10n/l10n_util.h"

13 #include "ui/base/resource/resource_bundle.h"	13 #include "ui/base/resource/resource_bundle.h"

14	14

15 namespace supervised_user_error_page {	15 namespace supervised_user_error_page {

16	16

17 struct BlockMessageIDTestParameter {	17 struct BlockMessageIDTestParameter {

18 FilteringBehaviorReason reason;	18 FilteringBehaviorReason reason;

(...skipping 182 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
201 "custodian2_email", false, DEFAULT, true},	201 "custodian2_email", false, DEFAULT, true},

202 {true, "url1", "url2", "custodian", "custodian_email", "custodian2",	202 {true, "url1", "url2", "custodian", "custodian_email", "custodian2",

203 "custodian2_email", false, ASYNC_CHECKER, true},	203 "custodian2_email", false, ASYNC_CHECKER, true},

204 };	204 };

205	205

206 INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized,	206 INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized,

207 SupervisedUserErrorPageTest_BuildHtml,	207 SupervisedUserErrorPageTest_BuildHtml,

208 ::testing::ValuesIn(build_html_test_parameter));	208 ::testing::ValuesIn(build_html_test_parameter));

209	209

210 } // namespace supervised_user_error_page	210 } // namespace supervised_user_error_page

OLD	NEW