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

Unified Diff: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

Issue 1784533004: [Media Router] Add origins to sink query results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
index ba7f0bf69f42b6b448ce4b8a2bb2486b547800c3..d720c4645fedfcd4be44717c199e67aecc96bff4 100644
--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <vector>
+
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -14,6 +16,7 @@
#include "chrome/browser/ui/ash/cast_config_delegate_media_router.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/test/test_utils.h"
+#include "url/gurl.h"
using testing::_;
@@ -119,19 +122,19 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,
// The tray should be hidden when there are no sinks.
EXPECT_FALSE(test_api.IsTrayVisible());
- media_sinks_observer()->OnSinksReceived(zero_sinks);
+ media_sinks_observer()->OnSinksUpdated(zero_sinks, std::vector<GURL>());
EXPECT_FALSE(test_api.IsTrayVisible());
EXPECT_FALSE(test_api.IsTraySelectViewVisible());
// The tray should be visible with any more than zero sinks.
- media_sinks_observer()->OnSinksReceived(one_sink);
+ media_sinks_observer()->OnSinksUpdated(one_sink, std::vector<GURL>());
EXPECT_TRUE(test_api.IsTrayVisible());
- media_sinks_observer()->OnSinksReceived(two_sinks);
+ media_sinks_observer()->OnSinksUpdated(two_sinks, std::vector<GURL>());
EXPECT_TRUE(test_api.IsTrayVisible());
EXPECT_TRUE(test_api.IsTraySelectViewVisible());
// And if all of the sinks go away, it should be hidden again.
- media_sinks_observer()->OnSinksReceived(zero_sinks);
+ media_sinks_observer()->OnSinksUpdated(zero_sinks, std::vector<GURL>());
EXPECT_FALSE(test_api.IsTrayVisible());
EXPECT_FALSE(test_api.IsTraySelectViewVisible());
@@ -154,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,
std::vector<media_router::MediaSink> sinks;
sinks.push_back(MakeSink("remote_sink", "name"));
sinks.push_back(MakeSink("local_sink", "name"));
- media_sinks_observer()->OnSinksReceived(sinks);
+ media_sinks_observer()->OnSinksUpdated(sinks, std::vector<GURL>());
// Create route combinations. More details below.
media_router::MediaRoute non_local_route =
« no previous file with comments | « chrome/browser/ui/ash/cast_config_delegate_media_router.cc ('k') | chrome/browser/ui/webui/media_router/media_router_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698