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

Unified Diff: chrome/installer/util/installation_state.h

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. 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/installer/util/install_util_unittest.cc ('k') | chrome/installer/util/installer_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installation_state.h
diff --git a/chrome/installer/util/installation_state.h b/chrome/installer/util/installation_state.h
index 5db03610af1a4b18ef2914b5463a7f551fa21cc3..532332dc2cab6247d7b13e8feee692e7233b6706 100644
--- a/chrome/installer/util/installation_state.h
+++ b/chrome/installer/util/installation_state.h
@@ -5,12 +5,12 @@
#ifndef CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
#define CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
+#include <memory>
#include <string>
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/installer/util/app_commands.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/channel_info.h"
@@ -105,8 +105,8 @@ class ProductState {
AppCommands* commands);
ChannelInfo channel_;
- scoped_ptr<Version> version_;
- scoped_ptr<Version> old_version_;
+ std::unique_ptr<Version> version_;
+ std::unique_ptr<Version> old_version_;
std::wstring brand_;
std::wstring rename_cmd_;
std::wstring oem_install_;
« no previous file with comments | « chrome/installer/util/install_util_unittest.cc ('k') | chrome/installer/util/installer_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698