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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

Issue 2559043002: [M56 branch] Compile fix for MediaRouterUITest (Closed)
Patch Set: Created 4 years 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/webui/media_router/media_router_ui.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 const auto& sorted_sinks = media_router_ui_->sinks_; 270 const auto& sorted_sinks = media_router_ui_->sinks_;
271 EXPECT_EQ(sink6.sink.id(), sorted_sinks[0].sink.id()); 271 EXPECT_EQ(sink6.sink.id(), sorted_sinks[0].sink.id());
272 EXPECT_EQ(sink4.sink.id(), sorted_sinks[1].sink.id()); 272 EXPECT_EQ(sink4.sink.id(), sorted_sinks[1].sink.id());
273 EXPECT_EQ(sink2.sink.id(), sorted_sinks[2].sink.id()); 273 EXPECT_EQ(sink2.sink.id(), sorted_sinks[2].sink.id());
274 EXPECT_EQ(sink5.sink.id(), sorted_sinks[3].sink.id()); 274 EXPECT_EQ(sink5.sink.id(), sorted_sinks[3].sink.id());
275 EXPECT_EQ(sink1.sink.id(), sorted_sinks[4].sink.id()); 275 EXPECT_EQ(sink1.sink.id(), sorted_sinks[4].sink.id());
276 EXPECT_EQ(sink3.sink.id(), sorted_sinks[5].sink.id()); 276 EXPECT_EQ(sink3.sink.id(), sorted_sinks[5].sink.id());
277 } 277 }
278 278
279 TEST_F(MediaRouterUITest, FilterNonDisplayRoutes) { 279 TEST_F(MediaRouterUITest, FilterNonDisplayRoutes) {
280 CreateMediaRouterUI(profile()); 280 CreateMediaRouterUI(&profile_);
281 281
282 MediaSource media_source("mediaSource"); 282 MediaSource media_source("mediaSource");
283 MediaRoute display_route_1("routeId1", media_source, "sinkId1", "desc 1", 283 MediaRoute display_route_1("routeId1", media_source, "sinkId1", "desc 1",
284 true, "", true); 284 true, "", true);
285 MediaRoute non_display_route_1("routeId2", media_source, "sinkId2", "desc 2", 285 MediaRoute non_display_route_1("routeId2", media_source, "sinkId2", "desc 2",
286 true, "", false); 286 true, "", false);
287 MediaRoute display_route_2("routeId3", media_source, "sinkId2", "desc 2", 287 MediaRoute display_route_2("routeId3", media_source, "sinkId2", "desc 2",
288 true, "", true); 288 true, "", true);
289 std::vector<MediaRoute> routes; 289 std::vector<MediaRoute> routes;
290 routes.push_back(display_route_1); 290 routes.push_back(display_route_1);
291 routes.push_back(non_display_route_1); 291 routes.push_back(non_display_route_1);
292 routes.push_back(display_route_2); 292 routes.push_back(display_route_2);
293 293
294 media_router_ui_->OnRoutesUpdated(routes, std::vector<MediaRoute::Id>()); 294 media_router_ui_->OnRoutesUpdated(routes, std::vector<MediaRoute::Id>());
295 ASSERT_EQ(2u, media_router_ui_->routes_.size()); 295 ASSERT_EQ(2u, media_router_ui_->routes_.size());
296 EXPECT_TRUE(display_route_1.Equals(media_router_ui_->routes_[0])); 296 EXPECT_TRUE(display_route_1.Equals(media_router_ui_->routes_[0]));
297 EXPECT_TRUE(media_router_ui_->routes_[0].for_display()); 297 EXPECT_TRUE(media_router_ui_->routes_[0].for_display());
298 EXPECT_TRUE(display_route_2.Equals(media_router_ui_->routes_[1])); 298 EXPECT_TRUE(display_route_2.Equals(media_router_ui_->routes_[1]));
299 EXPECT_TRUE(media_router_ui_->routes_[1].for_display()); 299 EXPECT_TRUE(media_router_ui_->routes_[1].for_display());
300 } 300 }
301 301
302 TEST_F(MediaRouterUITest, FilterNonDisplayJoinableRoutes) { 302 TEST_F(MediaRouterUITest, FilterNonDisplayJoinableRoutes) {
303 CreateMediaRouterUI(profile()); 303 CreateMediaRouterUI(&profile_);
304 304
305 MediaSource media_source("mediaSource"); 305 MediaSource media_source("mediaSource");
306 MediaRoute display_route_1("routeId1", media_source, "sinkId1", "desc 1", 306 MediaRoute display_route_1("routeId1", media_source, "sinkId1", "desc 1",
307 true, "", true); 307 true, "", true);
308 MediaRoute non_display_route_1("routeId2", media_source, "sinkId2", "desc 2", 308 MediaRoute non_display_route_1("routeId2", media_source, "sinkId2", "desc 2",
309 true, "", false); 309 true, "", false);
310 MediaRoute display_route_2("routeId3", media_source, "sinkId2", "desc 2", 310 MediaRoute display_route_2("routeId3", media_source, "sinkId2", "desc 2",
311 true, "", true); 311 true, "", true);
312 std::vector<MediaRoute> routes; 312 std::vector<MediaRoute> routes;
313 routes.push_back(display_route_1); 313 routes.push_back(display_route_1);
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 for (auto* observer : media_sinks_observers_) { 533 for (auto* observer : media_sinks_observers_) {
534 if (observer->source().id() == presentation_source_id) { 534 if (observer->source().id() == presentation_source_id) {
535 observer->OnSinksUpdated(sinks, origins); 535 observer->OnSinksUpdated(sinks, origins);
536 } 536 }
537 } 537 }
538 // Destroying the UI should return the expected error from above to the error 538 // Destroying the UI should return the expected error from above to the error
539 // callback. 539 // callback.
540 media_router_ui_.reset(); 540 media_router_ui_.reset();
541 } 541 }
542 } // namespace media_router 542 } // namespace media_router
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698