diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
| commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
| tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc | |
| parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
| download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz | |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc b/chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc index ec9102f0988..17268d133eb 100644 --- a/chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc +++ b/chromium/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc @@ -5,6 +5,8 @@ #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h" #include <memory> +#include <set> +#include <utility> #include "base/macros.h" #include "base/strings/stringprintf.h" @@ -95,7 +97,7 @@ class MockMediaRouterUI : public MediaRouterUI { MOCK_CONST_METHOD0(UserSelectedTabMirroringForCurrentOrigin, bool()); MOCK_METHOD1(RecordCastModeSelection, void(MediaCastMode cast_mode)); MOCK_CONST_METHOD0(GetPresentationRequestSourceName, std::string()); - MOCK_CONST_METHOD0(cast_modes, const std::set<MediaCastMode>&()); + MOCK_CONST_METHOD0(GetCastModes, const std::set<MediaCastMode>&()); MOCK_METHOD1(OnMediaControllerUIAvailable, void(const MediaRoute::Id& route_id)); MOCK_METHOD0(OnMediaControllerUIClosed, void()); @@ -169,7 +171,7 @@ class MediaRouterWebUIMessageHandlerTest : public MediaRouterWebUITest { // Gets the call data for the function call made to |web_ui_|. There needs // to be one call made, and its function name must be |function_name|. const base::Value* GetCallData(const std::string& function_name) { - CHECK(1u == web_ui_->call_data().size()); + CHECK_EQ(1u, web_ui_->call_data().size()); const content::TestWebUI::CallData& call_data = *web_ui_->call_data()[0]; CHECK(function_name == call_data.function_name()); return call_data.arg1(); @@ -553,7 +555,7 @@ TEST_F(MediaRouterWebUIMessageHandlerTest, RecordCastModeSelection) { TEST_F(MediaRouterWebUIMessageHandlerTest, RetrieveCastModeSelection) { base::ListValue args; std::set<MediaCastMode> cast_modes = {MediaCastMode::TAB_MIRROR}; - EXPECT_CALL(*mock_media_router_ui_, cast_modes()) + EXPECT_CALL(*mock_media_router_ui_, GetCastModes()) .WillRepeatedly(ReturnRef(cast_modes)); EXPECT_CALL(*mock_media_router_ui_, GetPresentationRequestSourceName()) |