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

Unified Diff: extensions/shell/browser/shell_native_app_window_aura_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
Index: extensions/shell/browser/shell_native_app_window_aura_unittest.cc
diff --git a/extensions/shell/browser/shell_native_app_window_aura_unittest.cc b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
index be7df4b80179bf239f49a36b8fbdd1bf3a3c99cb..67eef83c9356ba7af720f3cb227065afb68f7c71 100644
--- a/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
+++ b/extensions/shell/browser/shell_native_app_window_aura_unittest.cc
@@ -4,7 +4,9 @@
#include "extensions/shell/browser/shell_native_app_window_aura.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
@@ -33,14 +35,14 @@ class ShellNativeAppWindowAuraTest : public ExtensionsTest {
protected:
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<content::NotificationService> notification_service_;
+ std::unique_ptr<content::NotificationService> notification_service_;
ShellAppWindowClient app_window_client_;
};
TEST_F(ShellNativeAppWindowAuraTest, Bounds) {
// The BrowserContext used here must be destroyed before the thread bundle,
// because of destructors of things spawned from creating a WebContents.
- scoped_ptr<content::BrowserContext> browser_context(
+ std::unique_ptr<content::BrowserContext> browser_context(
new content::TestBrowserContext);
scoped_refptr<Extension> extension =
ExtensionBuilder()
@@ -56,7 +58,7 @@ TEST_F(ShellNativeAppWindowAuraTest, Bounds) {
content::WebContents* web_contents = content::WebContents::Create(
content::WebContents::CreateParams(browser_context.get()));
app_window->SetAppWindowContentsForTesting(
- make_scoped_ptr(new TestAppWindowContents(web_contents)));
+ base::WrapUnique(new TestAppWindowContents(web_contents)));
AppWindow::BoundsSpecification window_spec;
window_spec.bounds = gfx::Rect(100, 200, 300, 400);
« no previous file with comments | « extensions/shell/browser/shell_native_app_window.cc ('k') | extensions/shell/browser/shell_network_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698