implement user agent override option.

ios/web/navigation/navigation_manager_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_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
 #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 77 matching lines @@
   void OnNavigationItemCommitted();
 
   // Temporary accessors and content/ class pass-throughs.
   // TODO(stuartmorgan): Re-evaluate this list once the refactorings have
   // settled down.
   CRWSessionController* GetSessionController();
   void LoadURL(const GURL& url,
                const Referrer& referrer,
                ui::PageTransition type);
 
-  // Adds a new item with the given url, referrer, navigation type, and
-  // initiation type, making it the pending item. If pending item is the same as
-  // the current item, this does nothing. |referrer| may be nil if there isn't
-  // one. The item starts out as pending, and will be lost unless
-  // |-commitPendingItem| is called.
+  // Adds a new item with the given url, referrer, navigation type, initiation
+  // type and user agent override option, making it the pending item. If pending
+  // item is the same as the current item, this does nothing. |referrer| may be
+  // nil if there isn't one. The item starts out as pending, and will be lost
+  // unless |-commitPendingItem| is called.
   void AddPendingItem(const GURL& url,
                       const web::Referrer& referrer,
                       ui::PageTransition navigation_type,
-                      NavigationInitiationType initiation_type);
+                      NavigationInitiationType initiation_type,
+                      UserAgentOverrideOption user_agent_override_option);
 
   // Temporary method. Returns a vector of NavigationItems corresponding to
   // the SessionEntries of the uderlying CRWSessionController.
   // TODO(crbug.com/546365): Remove this method.
   NavigationItemList GetItems() const;
 
   // NavigationManager:
   BrowserState* GetBrowserState() const override;
   WebState* GetWebState() const override;
   NavigationItem* GetVisibleItem() const override;
@@ skipping 14 matching lines @@
   bool CanGoForward() const override;
   bool CanGoToOffset(int offset) const override;
   void GoBack() override;
   void GoForward() override;
   void GoToIndex(int index) override;
   void Reload(ReloadType reload_type, bool check_for_reposts) override;
   NavigationItemList GetBackwardItems() const override;
   NavigationItemList GetForwardItems() const override;
   void CopyStateFromAndPrune(const NavigationManager* source) override;
   bool CanPruneAllButLastCommittedItem() const override;
-  void OverrideDesktopUserAgentForNextPendingItem() override;
 
   // Returns the current list of transient url rewriters, passing ownership to
   // the caller.
   // TODO(crbug.com/546197): remove once NavigationItem creation occurs in this
   // class.
   std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
   GetTransientURLRewriters();
 
   // Called to reset the transient url rewriter list.
   void RemoveTransientURLRewriters();
@@ skipping 11 matching lines @@
   friend SessionStorageBuilder;
 
   // Returns true if the PageTransition for the underlying navigation item at
   // |index| has ui::PAGE_TRANSITION_IS_REDIRECT_MASK.
   bool IsRedirectItemAtIndex(int index) const;
 
   // Returns the most recent NavigationItem that does not have an app-specific
   // URL.
   NavigationItem* GetLastCommittedNonAppSpecificItem() const;
 
-  // If true, override navigation item's useDesktopUserAgent flag and always
-  // create the pending entry using the desktop user agent.
-  // TODO(crbug.com/692303): Remove this when overriding the user agent doesn't
-  // create a new NavigationItem.
-  bool override_desktop_user_agent_for_next_pending_item_;

[kkhorimoto, 2017/03/30 02:30:28]

Yay, I'm happy to see this go away :)

-
   // The primary delegate for this manager.
   NavigationManagerDelegate* delegate_;
 
   // The BrowserState that is associated with this instance.
   BrowserState* browser_state_;
 
   // CRWSessionController that backs this instance.
   // TODO(stuartmorgan): Fold CRWSessionController into this class.
   base::scoped_nsobject<CRWSessionController> session_controller_;
 
   // Weak pointer to the facade delegate.
   NavigationManagerFacadeDelegate* facade_delegate_;
 
   // List of transient url rewriters added by |AddTransientURLRewriter()|.
   std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
       transient_url_rewriters_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl);
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_