| Index: extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h
|
| diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h
|
| index b39a68db61d30f7a646e3d9f743ed3660f4b4ae2..d7afeee8447c018c69706b0b212c8ffa7e312af3 100644
|
| --- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h
|
| +++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef EXTENSIONS_BROWSER_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_
|
| #define EXTENSIONS_BROWSER_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/common/resource_type.h"
|
| #include "extensions/browser/api/declarative_webrequest/request_stage.h"
|
| #include "extensions/common/api/events.h"
|
| @@ -167,10 +167,11 @@ class WebRequestConditionAttributeRequestHeaders
|
|
|
| private:
|
| WebRequestConditionAttributeRequestHeaders(
|
| - scoped_ptr<const HeaderMatcher> header_matcher, bool positive);
|
| + std::unique_ptr<const HeaderMatcher> header_matcher,
|
| + bool positive);
|
| ~WebRequestConditionAttributeRequestHeaders() override;
|
|
|
| - const scoped_ptr<const HeaderMatcher> header_matcher_;
|
| + const std::unique_ptr<const HeaderMatcher> header_matcher_;
|
| const bool positive_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeRequestHeaders);
|
| @@ -200,10 +201,11 @@ class WebRequestConditionAttributeResponseHeaders
|
|
|
| private:
|
| WebRequestConditionAttributeResponseHeaders(
|
| - scoped_ptr<const HeaderMatcher> header_matcher, bool positive);
|
| + std::unique_ptr<const HeaderMatcher> header_matcher,
|
| + bool positive);
|
| ~WebRequestConditionAttributeResponseHeaders() override;
|
|
|
| - const scoped_ptr<const HeaderMatcher> header_matcher_;
|
| + const std::unique_ptr<const HeaderMatcher> header_matcher_;
|
| const bool positive_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeResponseHeaders);
|
|
|