Reversed WebState <-> CRWWebController ownership.

ios/web/web_state/web_state_impl.h

 // Copyright 2013 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_WEB_STATE_WEB_STATE_IMPL_H_
 #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 44 matching lines @@
 //          in preparation for saving.
 //  - WebControllers are the eventual long-term owners of WebStateImpls.
 //  - SessionWindows are transient owners, passing ownership into WebControllers
 //    during session restore, and discarding owned copies of WebStateImpls after
 //    writing them out for session saves.
 class WebStateImpl : public WebState, public NavigationManagerDelegate {
  public:
   WebStateImpl(BrowserState* browser_state);
   ~WebStateImpl() override;
 
-  // Sets the CRWWebController that backs this object. Typically
-  // |web_controller| will also take ownership of this object. This will also
-  // create the WebContentsIOS facade.
+  // Gets/Sets the CRWWebController that backs this object.
+  CRWWebController* GetWebController();
   void SetWebController(CRWWebController* web_controller);
 
   // Gets or sets the delegate used to communicate with the web contents facade.
   WebStateFacadeDelegate* GetFacadeDelegate() const;
   void SetFacadeDelegate(WebStateFacadeDelegate* facade_delegate);
 
   // Returns a WebStateImpl that doesn't have a browser context, web
   // controller, or facade set, but which otherwise has the same state variables
   // as the calling object (including copies of the NavigationManager and its
   // attendant CRWSessionController).
@@ skipping 202 matching lines @@
 
   // Stores whether the web state is currently loading a page.
   bool is_loading_;
 
   // Stores whether the web state is currently being destroyed.
   bool is_being_destroyed_;
 
   // The delegate used to pass state to the web contents facade.
   WebStateFacadeDelegate* facade_delegate_;
 
   // The CRWWebController that backs and owns this object.

[Jackie Quinn, 2016/04/12 20:03:46]

Comment needs update.

[Eugene But (OOO till 7-30), 2016/04/12 20:47:39]

Done.

-  CRWWebController* web_controller_;
+  base::scoped_nsobject<CRWWebController> web_controller_;
 
   NavigationManagerImpl navigation_manager_;
 
   // |web::WebUIIOS| object for the current page if it is a WebUI page that
   // uses the web-based WebUI framework, or nullptr otherwise.
   std::unique_ptr<web::WebUIIOS> web_ui_;
 
   // A list of observers notified when page state changes. Weak references.
   base::ObserverList<WebStateObserver, true> observers_;
 
@@ skipping 34 matching lines @@
   // any WeakPtrs to WebStateImpl are invalidated before its member variable's
   // destructors are executed, rendering them invalid.
   base::WeakPtrFactory<WebState> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStateImpl);
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_