Return unique_ptr from WebClient::CreateWebMainParts()

ios/web/public/web_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef IOS_WEB_PUBLIC_WEB_CLIENT_H_
 #define IOS_WEB_PUBLIC_WEB_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/task_scheduler/task_scheduler.h"
+#include "ios/web/public/app/web_main_parts.h"

[Eugene But (OOO till 7-30), 2017/01/20 22:11:41]

There is no need for include. Having predeclaration is fine.

[michaeldo, 2017/01/23 17:30:54]

Done.

 #include "ui/base/layout.h"
 #include "url/url_util.h"
 
 namespace base {
 class RefCountedMemory;
 class SchedulerWorkerPoolParams;
 }
 
 class GURL;
 
 @class UIWebView;
 @class NSString;
 
 namespace net {
 class SSLInfo;
 }
 
 namespace web {
 
 class BrowserState;
 class BrowserURLRewriter;
 class WebClient;
-class WebMainParts;
 class WebState;
 
 // Setter and getter for the client.  The client should be set early, before any
 // web code is called.
 void SetWebClient(WebClient* client);
 WebClient* GetWebClient();
 
 // Interface that the embedder of the web layer implements.
 class WebClient {
  public:
   WebClient();
   virtual ~WebClient();
 
   // Allows the embedder to set a custom WebMainParts implementation for the
   // browser startup code.
-  virtual WebMainParts* CreateWebMainParts();
+  virtual std::unique_ptr<WebMainParts> CreateWebMainParts();
 
   // Gives the embedder a chance to perform tasks before a web view is created.
   virtual void PreWebViewCreation() const {}
 
   // Gives the embedder a chance to register its own standard and saveable url
   // schemes early on in the startup sequence.
   virtual void AddAdditionalSchemes(
       std::vector<url::SchemeWithType>* additional_standard_schemes) const {}
 
   // Returns the languages used in the Accept-Languages HTTP header.
@@ skipping 73 matching lines @@
       base::TaskScheduler::WorkerPoolIndexForTraitsCallback*
           index_to_traits_callback) {}
 
   // Performs any necessary PostTask API redirection to the task scheduler.
   virtual void PerformExperimentalTaskSchedulerRedirections() {}
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_PUBLIC_WEB_CLIENT_H_