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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 6a3c7408760246a8c90aeb51d8601f8f4fe83458..4e033d2d766a3407ac45fba204b70b210effbce8 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -373,7 +373,7 @@ class RenderViewImplTest : public RenderViewTest {
}
private:
- scoped_ptr<MockKeyboard> mock_keyboard_;
+ std::unique_ptr<MockKeyboard> mock_keyboard_;
};
class DevToolsAgentTest : public RenderViewImplTest {
@@ -406,8 +406,9 @@ class DevToolsAgentTest : public RenderViewImplTest {
void OnDevToolsMessage(
int, int, const std::string& message, const std::string&) {
- scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(
- base::JSONReader::Read(message).release()));
+ std::unique_ptr<base::DictionaryValue> root(
+ static_cast<base::DictionaryValue*>(
+ base::JSONReader::Read(message).release()));
int id;
if (!root->GetInteger("id", &id)) {
std::string notification;
@@ -621,7 +622,7 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
// Check post data sent to browser matches
EXPECT_TRUE(base::get<0>(host_nav_params).page_state.IsValid());
- scoped_ptr<HistoryEntry> entry =
+ std::unique_ptr<HistoryEntry> entry =
PageStateToHistoryEntry(base::get<0>(host_nav_params).page_state);
blink::WebHTTPBody body = entry->root().httpBody();
blink::WebHTTPBody::Element element;
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698