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

Unified Diff: chrome/browser/chromeos/power/renderer_freezer_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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 | « chrome/browser/chromeos/power/renderer_freezer.cc ('k') | chrome/browser/chromeos/preferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/power/renderer_freezer_unittest.cc
diff --git a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc
index c1c48efa66e525ea2096010bc39d36ac3f801028..e34a7f1b941c00d7ebc7a17e71f9cb92183ac1cd 100644
--- a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc
+++ b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/chromeos/power/renderer_freezer.h"
+#include <memory>
#include <string>
#include <utility>
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
@@ -135,7 +135,7 @@ class RendererFreezerTest : public testing::Test {
: power_manager_client_(new FakePowerManagerClient()),
test_delegate_(new TestDelegate()) {
DBusThreadManager::GetSetterForTesting()->SetPowerManagerClient(
- scoped_ptr<PowerManagerClient>(power_manager_client_));
+ std::unique_ptr<PowerManagerClient>(power_manager_client_));
}
~RendererFreezerTest() override {
@@ -147,7 +147,7 @@ class RendererFreezerTest : public testing::Test {
protected:
void Init() {
renderer_freezer_.reset(new RendererFreezer(
- scoped_ptr<RendererFreezer::Delegate>(test_delegate_)));
+ std::unique_ptr<RendererFreezer::Delegate>(test_delegate_)));
}
// Owned by DBusThreadManager.
@@ -155,7 +155,7 @@ class RendererFreezerTest : public testing::Test {
// Owned by |renderer_freezer_|.
TestDelegate* test_delegate_;
- scoped_ptr<RendererFreezer> renderer_freezer_;
+ std::unique_ptr<RendererFreezer> renderer_freezer_;
private:
content::TestBrowserThreadBundle browser_thread_bundle_;
@@ -250,12 +250,12 @@ class RendererFreezerTestWithExtensions : public RendererFreezerTest {
protected:
void CreateRenderProcessForExtension(extensions::Extension* extension) {
- scoped_ptr<content::MockRenderProcessHostFactory> rph_factory(
+ std::unique_ptr<content::MockRenderProcessHostFactory> rph_factory(
new content::MockRenderProcessHostFactory());
scoped_refptr<content::SiteInstance> site_instance(
extensions::ProcessManager::Get(profile_)->GetSiteInstanceForURL(
extensions::BackgroundInfo::GetBackgroundURL(extension)));
- scoped_ptr<content::RenderProcessHost> rph(
+ std::unique_ptr<content::RenderProcessHost> rph(
rph_factory->CreateRenderProcessHost(profile_, site_instance.get()));
// Fake that the RenderProcessHost is hosting the gcm app.
@@ -271,7 +271,7 @@ class RendererFreezerTestWithExtensions : public RendererFreezerTest {
// Owned by |profile_manager_|.
TestingProfile* profile_;
- scoped_ptr<TestingProfileManager> profile_manager_;
+ std::unique_ptr<TestingProfileManager> profile_manager_;
private:
// Chrome OS needs extra services to run in the following order.
@@ -288,11 +288,11 @@ TEST_F(RendererFreezerTestWithExtensions, FreezesNonExtensionRenderers) {
Init();
// Create the mock RenderProcessHost.
- scoped_ptr<content::MockRenderProcessHostFactory> rph_factory(
+ std::unique_ptr<content::MockRenderProcessHostFactory> rph_factory(
new content::MockRenderProcessHostFactory());
scoped_refptr<content::SiteInstance> site_instance(
content::SiteInstance::Create(profile_));
- scoped_ptr<content::RenderProcessHost> rph(
+ std::unique_ptr<content::RenderProcessHost> rph(
rph_factory->CreateRenderProcessHost(profile_, site_instance.get()));
// Send the notification that the RenderProcessHost has been created.
« no previous file with comments | « chrome/browser/chromeos/power/renderer_freezer.cc ('k') | chrome/browser/chromeos/preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698