Fix managed mode allow/block flow

chrome/browser/managed_mode/managed_mode_navigation_observer.h

 // Copyright (c) 2012 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 CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_
 
 #include <set>
 
 #include "base/values.h"
@@ skipping 51 matching lines @@
   };
 
   friend class content::WebContentsUserData<ManagedModeNavigationObserver>;
 
   explicit ManagedModeNavigationObserver(content::WebContents* web_contents);
 
   // Adding the temporary exception stops the ResourceThrottle from showing
   // an interstitial for this RenderView. This allows the user to navigate
   // around on the website after clicking preview.
   void AddTemporaryException();
-  // Updates the ResourceThrottle with the latest user navigation status.
-  void UpdateExceptionNavigationStatus();
   void RemoveTemporaryException();
 
   void AddURLToPatternList(const GURL& url);
 
   // content::WebContentsObserver implementation.
   // An example regarding the order in which these events take place for
   // google.com in our case is as follows:
   // 1. User types in google.com and clicks enter.
   //  -> NavigateToPendingEntry: http://google.com
   //  -> DidStartProvisionalLoadForFrame http://google.com
@@ skipping 11 matching lines @@
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void ProvisionalChangeToMainFrameUrl(
       const GURL& url,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_id,
       bool is_main_frame,
       const GURL& url,
       content::PageTransition transition_type,
       content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidGetUserGesture() OVERRIDE;
 
   // Returns whether the user would stay in elevated state if he visits this
   // URL.
   bool ShouldStayElevatedForURL(const GURL& url);
 
   // Owned by the profile, so outlives us.
   ManagedUserService* managed_user_service_;
 
   // Owned by ManagedUserService.
   const ManagedModeURLFilter* url_filter_;
 
   // Owned by the InfoBarService, which has the same lifetime as this object.
   InfoBarDelegate* warn_infobar_delegate_;
   InfoBarDelegate* preview_infobar_delegate_;
 
-  // Whether we received a user gesture.
-  // The goal is to allow automatic redirects (in order not to break the flow
-  // or show too many interstitials) while not allowing the user to navigate
-  // to blocked pages. We consider a redirect to be automatic if we did
-  // not get a user gesture.
-  bool got_user_gesture_;
   ObserverState state_;
   std::set<GURL> navigated_urls_;
   GURL last_url_;
 
   // The elevation state corresponding to the current WebContents.
   // Will be set to true for non-managed users.
   bool is_elevated_;
 
   int last_allowed_page_;
 
+  // There are two starting points for a new navigation:
+  // 1. NavigateToPendingEntry when the omnibox is used to navigate to a URL or
+  //    the user goes back or forward.
+  // 2. ProvisionalChangeToMainFrameURL when the user clicks on a link.
+  // The main problem is that ProvisionalChangeToMainFrameURL is called for
+  // redirects as well and we need a way to distinguish between the two
+  // scenarios. |finished_redirects_| helps us do that by tracking the cases
+  // when the user did not click on a URL.
+  bool finished_redirects_;
+
   DISALLOW_COPY_AND_ASSIGN(ManagedModeNavigationObserver);
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_