| Index: components/navigation_interception/intercept_navigation_delegate.h
|
| diff --git a/components/navigation_interception/intercept_navigation_delegate.h b/components/navigation_interception/intercept_navigation_delegate.h
|
| index 9b1fe2960594211bbbf73a8ae527d723ad71d595..f549126fed47aa17001b572c0603f805b7441b31 100644
|
| --- a/components/navigation_interception/intercept_navigation_delegate.h
|
| +++ b/components/navigation_interception/intercept_navigation_delegate.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
| #define COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/android/jni_weak_ref.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/supports_user_data.h"
|
|
|
| class GURL;
|
| @@ -46,14 +47,14 @@ class InterceptNavigationDelegate : public base::SupportsUserData::Data {
|
| // As implied by the use of scoped_ptr, the WebContents will assume ownership
|
| // of |delegate|.
|
| static void Associate(content::WebContents* web_contents,
|
| - scoped_ptr<InterceptNavigationDelegate> delegate);
|
| + std::unique_ptr<InterceptNavigationDelegate> delegate);
|
| // Gets the InterceptNavigationDelegate associated with the WebContents,
|
| // can be null.
|
| static InterceptNavigationDelegate* Get(content::WebContents* web_contents);
|
|
|
| // Creates a InterceptNavigationThrottle that will direct all callbacks to
|
| // the InterceptNavigationDelegate.
|
| - static scoped_ptr<content::NavigationThrottle> CreateThrottleFor(
|
| + static std::unique_ptr<content::NavigationThrottle> CreateThrottleFor(
|
| content::NavigationHandle* handle);
|
|
|
| // Updates information to determine whether to have user gesture carryover or
|
|
|