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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "chrome/browser/ui/browser_commands.h" 7 #include "chrome/browser/ui/browser_commands.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/browser/ui/webui/media_router/media_router_test.h" 9 #include "chrome/browser/ui/webui/media_router/media_router_test.h"
10 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" 10 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 mock_media_router_ui_.reset(); 87 mock_media_router_ui_.reset();
88 web_ui_.reset(); 88 web_ui_.reset();
89 BrowserWithTestWindowTest::TearDown(); 89 BrowserWithTestWindowTest::TearDown();
90 } 90 }
91 91
92 const std::string& provider_extension_id() const { 92 const std::string& provider_extension_id() const {
93 return provider_extension_id_; 93 return provider_extension_id_;
94 } 94 }
95 95
96 protected: 96 protected:
97 scoped_ptr<content::TestWebUI> web_ui_; 97 std::unique_ptr<content::TestWebUI> web_ui_;
98 scoped_ptr<MockMediaRouterUI> mock_media_router_ui_; 98 std::unique_ptr<MockMediaRouterUI> mock_media_router_ui_;
99 scoped_ptr<TestMediaRouterWebUIMessageHandler> handler_; 99 std::unique_ptr<TestMediaRouterWebUIMessageHandler> handler_;
100 const std::string provider_extension_id_; 100 const std::string provider_extension_id_;
101 }; 101 };
102 102
103 TEST_F(MediaRouterWebUIMessageHandlerTest, UpdateSinks) { 103 TEST_F(MediaRouterWebUIMessageHandlerTest, UpdateSinks) {
104 MediaSink::Id sink_id("sinkId123"); 104 MediaSink::Id sink_id("sinkId123");
105 std::string sink_name("The sink"); 105 std::string sink_name("The sink");
106 106
107 std::vector<MediaSinkWithCastModes> media_sink_with_cast_modes_list; 107 std::vector<MediaSinkWithCastModes> media_sink_with_cast_modes_list;
108 MediaSinkWithCastModes media_sink_with_cast_modes( 108 MediaSinkWithCastModes media_sink_with_cast_modes(
109 MediaSink(sink_id, sink_name, MediaSink::IconType::CAST)); 109 MediaSink(sink_id, sink_name, MediaSink::IconType::CAST));
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 450
451 EXPECT_TRUE(issue_value->GetString("routeId", &value)); 451 EXPECT_TRUE(issue_value->GetString("routeId", &value));
452 EXPECT_EQ(route_id, value); 452 EXPECT_EQ(route_id, value);
453 453
454 bool actual_is_blocking = false; 454 bool actual_is_blocking = false;
455 EXPECT_TRUE(issue_value->GetBoolean("isBlocking", &actual_is_blocking)); 455 EXPECT_TRUE(issue_value->GetBoolean("isBlocking", &actual_is_blocking));
456 EXPECT_EQ(is_blocking, actual_is_blocking); 456 EXPECT_EQ(is_blocking, actual_is_blocking);
457 } 457 }
458 458
459 } // namespace media_router 459 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698