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

Unified Diff: extensions/shell/browser/shell_screen_unittest.cc

Issue 1908953003: Convert //extensions/{common,shell} 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/browser/shell_prefs_unittest.cc ('k') | extensions/shell/common/shell_extensions_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_screen_unittest.cc
diff --git a/extensions/shell/browser/shell_screen_unittest.cc b/extensions/shell/browser/shell_screen_unittest.cc
index 691a85fee100e12479ea6d13941289397e2d68a9..f113bfa46deee39db2428261af3f513d3ae99216 100644
--- a/extensions/shell/browser/shell_screen_unittest.cc
+++ b/extensions/shell/browser/shell_screen_unittest.cc
@@ -4,7 +4,8 @@
#include "extensions/shell/browser/shell_screen.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/window.h"
@@ -31,7 +32,8 @@ TEST_F(ShellScreenTest, ShellScreen) {
// Tests that reshaping the host window reshapes the display.
// NOTE: AuraTestBase already has its own WindowTreeHost. This is creating a
// second one.
- scoped_ptr<aura::WindowTreeHost> host(screen.CreateHostForPrimaryDisplay());
+ std::unique_ptr<aura::WindowTreeHost> host(
+ screen.CreateHostForPrimaryDisplay());
EXPECT_TRUE(host->window());
host->window()->SetBounds(gfx::Rect(0, 0, 800, 600));
EXPECT_EQ("800x600", screen.GetPrimaryDisplay().size().ToString());
« no previous file with comments | « extensions/shell/browser/shell_prefs_unittest.cc ('k') | extensions/shell/common/shell_extensions_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698