| Index: chrome/installer/util/conditional_work_item_list.h
|
| diff --git a/chrome/installer/util/conditional_work_item_list.h b/chrome/installer/util/conditional_work_item_list.h
|
| index ae5cdc9c7645da8c83019bd864a4ba4c01b0e47d..834b1e0df66bdafefb0774cf8962bed6fea69b58 100644
|
| --- a/chrome/installer/util/conditional_work_item_list.h
|
| +++ b/chrome/installer/util/conditional_work_item_list.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
|
| #define CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
|
|
|
| -#include "chrome/installer/util/work_item_list.h"
|
| +#include <memory>
|
|
|
| #include "base/files/file_path.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "chrome/installer/util/work_item_list.h"
|
|
|
| // A WorkItemList subclass that permits conditionally executing a set of
|
| // WorkItems.
|
| @@ -28,7 +28,7 @@ class ConditionalWorkItemList : public WorkItemList {
|
| protected:
|
| // Pointer to a Condition that is used to determine whether to run this
|
| // WorkItemList.
|
| - scoped_ptr<Condition> condition_;
|
| + std::unique_ptr<Condition> condition_;
|
| };
|
|
|
|
|
| @@ -54,7 +54,7 @@ class Not : public WorkItem::Condition {
|
| bool ShouldRun() const override;
|
|
|
| private:
|
| - scoped_ptr<WorkItem::Condition> original_condition_;
|
| + std::unique_ptr<WorkItem::Condition> original_condition_;
|
| };
|
|
|
| #endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
|
|
|