components/media_router/media_route_unittest.cc - Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom

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/media_router/media_route_unittest.cc

Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom (Closed)

Patch Set: . Created 3 years, 8 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

« components/media_router/issue_unittest.cc ('K') | « components/media_router/media_route.cc ('k') | components/media_router/media_sink.h » ('j') | components/media_router/media_sink.cc » ('J')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "chrome/browser/media/router/media_route.h"	5 #include "components/media_router/media_route.h"

6 #include "chrome/browser/media/router/media_sink.h"	6 #include "components/media_router/media_sink.h"
	sdefresne 2017/04/03 13:34:06 nit: blank line above nit: blank line above takumif 2017/04/04 17:34:50 Done. Show quoted text On 2017/04/03 13:34:06, sdefresne wrote: > nit: blank line above Done.
7 #include "chrome/browser/media/router/media_source_helper.h"	7 #include "components/media_router/media_source_helper.h"

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

9	9

10 namespace {	10 namespace {

11 constexpr char kRouteId1[] =	11 constexpr char kRouteId1[] =

12 "urn:x-org.chromium:media:route:1/cast-sink1/http://foo.com";	12 "urn:x-org.chromium:media:route:1/cast-sink1/http://foo.com";

13 constexpr char kRouteId2[] =	13 constexpr char kRouteId2[] =

14 "urn:x-org.chromium:media:route:2/cast-sink2/http://foo.com";	14 "urn:x-org.chromium:media:route:2/cast-sink2/http://foo.com";

15 constexpr char kPresentationUrl[] = "http://www.example.com/presentation.html";	15 constexpr char kPresentationUrl[] = "http://www.example.com/presentation.html";

16 } // namespace	16 } // namespace

17	17

(...skipping 27 matching lines...) Expand all Loading...
45 EXPECT_FALSE(route1.Equals(route5));	45 EXPECT_FALSE(route1.Equals(route5));

46	46

47 // Same as route1 with different incognito.	47 // Same as route1 with different incognito.

48 MediaRoute route6(kRouteId1, media_source, "sinkId", "Description", true, "",	48 MediaRoute route6(kRouteId1, media_source, "sinkId", "Description", true, "",

49 false);	49 false);

50 route6.set_incognito(true);	50 route6.set_incognito(true);

51 EXPECT_TRUE(route1.Equals(route6));	51 EXPECT_TRUE(route1.Equals(route6));

52 }	52 }

53	53

54 } // namespace media_router	54 } // namespace media_router

OLD	NEW