Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/media/router/media_sinks_observer_unittest.cc

Issue 2627463003: Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: return an Origin instead of GURL for GetLastCommittedURLForFrame Created 3 years, 11 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
OLDNEW
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 "chrome/browser/media/router/media_source_helper.h" 5 #include "chrome/browser/media/router/media_source_helper.h"
6 #include "chrome/browser/media/router/mock_media_router.h" 6 #include "chrome/browser/media/router/mock_media_router.h"
7 #include "chrome/browser/media/router/test_helper.h" 7 #include "chrome/browser/media/router/test_helper.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 namespace media_router { 11 namespace media_router {
12 12
13 TEST(MediaSinksObserverTest, OriginMatching) { 13 TEST(MediaSinksObserverTest, OriginMatching) {
14 MockMediaRouter router; 14 MockMediaRouter router;
15 MediaSource source( 15 MediaSource source(
16 MediaSourceForPresentationUrl(GURL("https://presentation.com"))); 16 MediaSourceForPresentationUrl(GURL("https://presentation.com")));
17 GURL origin("https://origin.com"); 17 url::Origin origin((GURL("https://origin.com")));
dcheng 2017/01/26 04:16:32 Nit: Here and elsewhere write: url::Origin origin{
steimel 2017/01/27 00:28:59 Done.
18 std::vector<GURL> origin_list; 18 std::vector<url::Origin> origin_list;
mark a. foltz 2017/01/24 04:04:17 nit: origin_list({origin}) instead of calling push
steimel 2017/01/25 19:01:11 Done.
19 origin_list.push_back(origin); 19 origin_list.push_back(origin);
20 std::vector<MediaSink> sink_list; 20 std::vector<MediaSink> sink_list;
21 sink_list.push_back(MediaSink("sinkId", "Sink", MediaSink::IconType::CAST)); 21 sink_list.push_back(MediaSink("sinkId", "Sink", MediaSink::IconType::CAST));
22 MockMediaSinksObserver observer(&router, source, origin); 22 MockMediaSinksObserver observer(&router, source, origin);
23 23
24 EXPECT_CALL(observer, OnSinksReceived(SequenceEquals(sink_list))); 24 EXPECT_CALL(observer, OnSinksReceived(SequenceEquals(sink_list)));
25 observer.OnSinksUpdated(sink_list, origin_list); 25 observer.OnSinksUpdated(sink_list, origin_list);
26 26
27 EXPECT_CALL(observer, OnSinksReceived(SequenceEquals(sink_list))); 27 EXPECT_CALL(observer, OnSinksReceived(SequenceEquals(sink_list)));
28 observer.OnSinksUpdated(sink_list, std::vector<GURL>()); 28 observer.OnSinksUpdated(sink_list, std::vector<url::Origin>());
29 29
30 GURL origin2("https://differentOrigin.com"); 30 url::Origin origin2((GURL("https://differentOrigin.com")));
31 origin_list.clear(); 31 origin_list.clear();
32 origin_list.push_back(origin2); 32 origin_list.push_back(origin2);
33 EXPECT_CALL(observer, OnSinksReceived(testing::IsEmpty())); 33 EXPECT_CALL(observer, OnSinksReceived(testing::IsEmpty()));
34 observer.OnSinksUpdated(sink_list, origin_list); 34 observer.OnSinksUpdated(sink_list, origin_list);
35 } 35 }
36 36
37 } // namespace media_router 37 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698