| Index: ios/web/webui/crw_web_ui_manager.mm
|
| diff --git a/ios/web/webui/crw_web_ui_manager.mm b/ios/web/webui/crw_web_ui_manager.mm
|
| index 84cd21a7ca2d16694022b3a7184982f904c3664c..2a8bd77991150f062ce2d711e978ba064a3d6bb5 100644
|
| --- a/ios/web/webui/crw_web_ui_manager.mm
|
| +++ b/ios/web/webui/crw_web_ui_manager.mm
|
| @@ -52,7 +52,7 @@ const char kScriptCommandPrefix[] = "webui";
|
| // Set of live WebUI fetchers for retrieving data.
|
| ScopedVector<web::URLFetcherBlockAdapter> _fetchers;
|
| // Bridge to observe the web state from Objective-C.
|
| - scoped_ptr<web::WebStateObserverBridge> _webStateObserverBridge;
|
| + std::unique_ptr<web::WebStateObserverBridge> _webStateObserverBridge;
|
| // Weak WebStateImpl this CRWWebUIManager is associated with.
|
| web::WebStateImpl* _webState;
|
| }
|
| @@ -215,10 +215,10 @@ const char kScriptCommandPrefix[] = "webui";
|
|
|
| #pragma mark - Testing-Only Methods
|
|
|
| -- (scoped_ptr<web::URLFetcherBlockAdapter>)
|
| - fetcherForURL:(const GURL&)URL
|
| - completionHandler:(web::URLFetcherBlockAdapterCompletion)handler {
|
| - return scoped_ptr<web::URLFetcherBlockAdapter>(
|
| +- (std::unique_ptr<web::URLFetcherBlockAdapter>)
|
| + fetcherForURL:(const GURL&)URL
|
| +completionHandler:(web::URLFetcherBlockAdapterCompletion)handler {
|
| + return std::unique_ptr<web::URLFetcherBlockAdapter>(
|
| new web::URLFetcherBlockAdapter(
|
| URL, _webState->GetBrowserState()->GetRequestContext(), handler));
|
| }
|
|
|