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

Unified Diff: chrome/browser/ui/hung_plugin_tab_helper.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/global_error/global_error_service_unittest.cc ('k') | chrome/browser/ui/ime/ime_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/hung_plugin_tab_helper.cc
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 50d43242dd9e5e0115480ab345ec509891d11244..8d085416361360773f9caa7af4546ee075ef02b9 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -4,10 +4,11 @@
#include "chrome/browser/ui/hung_plugin_tab_helper.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/process/process.h"
#include "base/rand_util.h"
#include "build/build_config.h"
@@ -168,7 +169,7 @@ infobars::InfoBar* HungPluginInfoBarDelegate::Create(
int plugin_child_id,
const base::string16& plugin_name) {
return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
- scoped_ptr<ConfirmInfoBarDelegate>(new HungPluginInfoBarDelegate(
+ std::unique_ptr<ConfirmInfoBarDelegate>(new HungPluginInfoBarDelegate(
helper, plugin_child_id, plugin_name))));
}
@@ -365,7 +366,8 @@ void HungPluginTabHelper::KillPlugin(int child_id) {
if (base::RandInt(0, 100) < 20) {
version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY) {
- scoped_ptr<OwnedHandleVector> renderer_handles(new OwnedHandleVector);
+ std::unique_ptr<OwnedHandleVector> renderer_handles(
+ new OwnedHandleVector);
HANDLE current_process = ::GetCurrentProcess();
content::RenderProcessHost::iterator renderer_iter =
content::RenderProcessHost::AllHostsIterator();
« no previous file with comments | « chrome/browser/ui/global_error/global_error_service_unittest.cc ('k') | chrome/browser/ui/ime/ime_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698