content/browser/service_manager/merge_dictionary_unittest.cc - Issue 2387263002: Rename MojoShellContext -> ServiceManagerContext.

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: content/browser/service_manager/merge_dictionary_unittest.cc

Issue 2387263002: Rename MojoShellContext -> ServiceManagerContext. (Closed)

Patch Set: . Created 4 years, 2 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

« no previous file with comments | « content/browser/service_manager/merge_dictionary.cc ('k') | content/browser/service_manager/service_manager_context.h » ('j') | no next file with comments »

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 "base/memory/ptr_util.h"	5 #include "base/memory/ptr_util.h"

6 #include "content/browser/mojo/merge_dictionary.h"	6 #include "content/browser/service_manager/merge_dictionary.h"

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

8	8

9 namespace content {	9 namespace content {

10	10

11 using MergeDictionaryTest = testing::Test;	11 using MergeDictionaryTest = testing::Test;

12	12

13 TEST(MergeDictionaryTest, Merge) {	13 TEST(MergeDictionaryTest, Merge) {

14 // \|source\| & \|target\| have three properties, "string", "list" and	14 // \|source\| & \|target\| have three properties, "string", "list" and

15 // "dictionary", which are then merged.	15 // "dictionary", which are then merged.

16 base::DictionaryValue target;	16 base::DictionaryValue target;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 std::string a, b, c;	64 std::string a, b, c;

65 EXPECT_TRUE(out_list->GetString(0, &a));	65 EXPECT_TRUE(out_list->GetString(0, &a));

66 EXPECT_TRUE(out_list->GetString(1, &b));	66 EXPECT_TRUE(out_list->GetString(1, &b));

67 EXPECT_TRUE(out_list->GetString(2, &c));	67 EXPECT_TRUE(out_list->GetString(2, &c));

68 EXPECT_EQ("A", a);	68 EXPECT_EQ("A", a);

69 EXPECT_EQ("B", b);	69 EXPECT_EQ("B", b);

70 EXPECT_EQ("C", c);	70 EXPECT_EQ("C", c);

71 }	71 }

72	72

73 } // namespace content	73 } // namespace content

OLD	NEW