Fix nits in MediaRouterUI.

Change-Id: I0c3fd5349b0ee3791948d24bde664fd253d0c560
Reviewed-on: https://chromium-review.googlesource.com/c/1258053Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604149}

chrome/browser/ui/webui/media_router/media_router_ui.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 
-#include <algorithm>
-#include <string>
-#include <unordered_map>
 #include <utility>
 
 #include "base/guid.h"
@@ -61,7 +58,6 @@ namespace media_router {
 
 MediaRouterUI::MediaRouterUI(content::WebUI* web_ui)
     : ConstrainedWebDialogUI(web_ui),
-      ui_initialized_(false),
       weak_factory_(this) {
   auto handler = std::make_unique<MediaRouterWebUIMessageHandler>(this);
   handler_ = handler.get();
@@ -177,7 +173,7 @@ std::string MediaRouterUI::GetPresentationRequestSourceName() const {
              : GetHostFromURL(gurl);
 }
 
-const std::set<MediaCastMode>& MediaRouterUI::cast_modes() const {
+const std::set<MediaCastMode>& MediaRouterUI::GetCastModes() const {
   return cast_modes_;
 }
 
@@ -368,14 +364,14 @@ void MediaRouterUI::UpdateCastModes() {
   // UI.
   cast_modes_ = query_result_manager()->GetSupportedCastModes();
   if (ui_initialized_) {
-    handler_->UpdateCastModes(cast_modes(), GetPresentationRequestSourceName(),
-                              forced_cast_mode());
+    handler_->UpdateCastModes(
+        GetCastModes(), GetPresentationRequestSourceName(), forced_cast_mode());
   }
 }
 
 void MediaRouterUI::UpdateRoutesToCastModesMapping() {
   std::unordered_map<MediaSource::Id, MediaCastMode> available_source_map;
-  for (const auto& cast_mode : cast_modes()) {
+  for (const auto& cast_mode : GetCastModes()) {
     for (const auto& source : GetSourcesForCastMode(cast_mode))
       available_source_map.insert(std::make_pair(source.id(), cast_mode));
   }

chrome/browser/ui/webui/media_router/media_router_ui.h

@@ -5,6 +5,12 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
 
+#include <memory>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/media/router/mojo/media_route_controller.h"
@@ -61,7 +67,7 @@ class MediaRouterUI : public MediaRouterUIBase, public ConstrainedWebDialogUI {
   const std::vector<MediaRoute::Id>& joinable_route_ids() const {
     return joinable_route_ids_;
   }
-  virtual const std::set<MediaCastMode>& cast_modes() const;
+  virtual const std::set<MediaCastMode>& GetCastModes() const;
   const std::unordered_map<MediaRoute::Id, MediaCastMode>&
   routes_and_cast_modes() const {
     return routes_and_cast_modes_;
@@ -128,7 +134,7 @@ class MediaRouterUI : public MediaRouterUIBase, public ConstrainedWebDialogUI {
 
   class UIMediaRouteControllerObserver : public MediaRouteController::Observer {
    public:
-    explicit UIMediaRouteControllerObserver(
+    UIMediaRouteControllerObserver(
         MediaRouterUI* ui,
         scoped_refptr<MediaRouteController> controller);
     ~UIMediaRouteControllerObserver() override;
@@ -138,7 +144,7 @@ class MediaRouterUI : public MediaRouterUIBase, public ConstrainedWebDialogUI {
     void OnControllerInvalidated() override;
 
    private:
-    MediaRouterUI* ui_;
+    MediaRouterUI* const ui_;
 
     DISALLOW_COPY_AND_ASSIGN(UIMediaRouteControllerObserver);
   };
@@ -204,7 +210,7 @@ class MediaRouterUI : public MediaRouterUIBase, public ConstrainedWebDialogUI {
   MediaRouterWebUIMessageHandler* handler_ = nullptr;
 
   // Set to true by |handler_| when the UI has been initialized.
-  bool ui_initialized_;
+  bool ui_initialized_ = false;
 
   std::vector<MediaRoute::Id> joinable_route_ids_;
   CastModeSet cast_modes_;

chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

@@ -787,7 +787,7 @@ TEST_F(MediaRouterUITest, SetsForcedCastModeWithPresentationURLs) {
   media_router_ui_->InitForTest(
       &mock_router_, web_contents(), message_handler_.get(),
       std::move(start_presentation_context_), nullptr);
-  EXPECT_EQ(expected_modes, media_router_ui_->cast_modes());
+  EXPECT_EQ(expected_modes, media_router_ui_->GetCastModes());
   EXPECT_EQ(base::Optional<MediaCastMode>(MediaCastMode::PRESENTATION),
             media_router_ui_->forced_cast_mode());
   EXPECT_EQ("google.com", media_router_ui_->GetPresentationRequestSourceName());

chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

@@ -541,7 +541,7 @@ void MediaRouterWebUIMessageHandler::OnRequestInitialData(
       media_router_ui_->routes_and_cast_modes()));
   initial_data.Set("routes", std::move(routes));
 
-  const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
+  const std::set<MediaCastMode>& cast_modes = media_router_ui_->GetCastModes();
   std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue(
       cast_modes, media_router_ui_->GetPresentationRequestSourceName(),
       media_router_ui_->forced_cast_mode()));

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())