Fix crashes in DownloadRequestLimiter when extension popups/bubbles initiate downloads automatically

chrome/browser/ui/browser.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_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 800 matching lines @@
   void ShowFirstRunBubble();
 
   void set_pending_web_app_action(WebAppAction action) {
     pending_web_app_action_ = action;
   }
 
   ExtensionWindowController* extension_window_controller() const {
     return extension_window_controller_.get();
   }
 
- protected:
-  // Wrapper for the factory method in BrowserWindow. This allows subclasses to
-  // set their own window.
-  virtual BrowserWindow* CreateBrowserWindow();
-
- private:
-  friend class BrowserTest;
-  FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
-  FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
-                           DenyExitsFullscreen);
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref);
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
-                           OpenAppShortcutWindowPref);
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref);
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel);
-
-  // Used to describe why a tab is being detached. This is used by
-  // TabDetachedAtImpl.
-  enum DetachType {
-    // Result of TabDetachedAt.
-    DETACH_TYPE_DETACH,
-
-    // Result of TabReplacedAt.
-    DETACH_TYPE_REPLACE,
-
-    // Result of the tab strip not having any significant tabs.
-    DETACH_TYPE_EMPTY
-  };
-
-  // Describes where the bookmark bar state change originated from.
-  enum BookmarkBarStateChangeReason {
-    // From the constructor.
-    BOOKMARK_BAR_STATE_CHANGE_INIT,
-
-    // Change is the result of the active tab changing.
-    BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH,
-
-    // Change is the result of the bookmark bar pref changing.
-    BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE,
-
-    // Change is the result of a state change in the active tab.
-    BOOKMARK_BAR_STATE_CHANGE_TAB_STATE,
-
-    // Change is the result of window toggling in/out of fullscreen mode.
-    BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN,
-  };
-
   // Overridden from content::WebContentsDelegate:

[Ben Goodger (Google), 2012/05/29 18:23:48]

... and also, I don't like having these methods exposed publicly on Browser. I
may not be able to perpetually guarantee that Browser will always be a WCD, so I
don't like exposing these as part of Browser's public API.

   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
   virtual void NavigationStateChanged(const content::WebContents* source,
                                       unsigned changed_flags) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture) OVERRIDE;
@@ skipping 88 matching lines @@
                                      const string16& title,
                                      const string16& disposition) OVERRIDE;
   virtual void WebIntentDispatch(
       content::WebContents* tab,
       content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;
   virtual void UpdatePreferredSize(content::WebContents* source,
                                    const gfx::Size& pref_size) OVERRIDE;
   virtual void ResizeDueToAutoResize(content::WebContents* source,
                                      const gfx::Size& new_size) OVERRIDE;
 
+ protected:
+  // Wrapper for the factory method in BrowserWindow. This allows subclasses to
+  // set their own window.
+  virtual BrowserWindow* CreateBrowserWindow();
+
+ private:
+  friend class BrowserTest;
+  FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
+  FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
+  FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
+  FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
+  FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
+  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
+  FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
+                           DenyExitsFullscreen);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
+                           OpenAppShortcutWindowPref);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel);
+
+  // Used to describe why a tab is being detached. This is used by
+  // TabDetachedAtImpl.
+  enum DetachType {
+    // Result of TabDetachedAt.
+    DETACH_TYPE_DETACH,
+
+    // Result of TabReplacedAt.
+    DETACH_TYPE_REPLACE,
+
+    // Result of the tab strip not having any significant tabs.
+    DETACH_TYPE_EMPTY
+  };
+
+  // Describes where the bookmark bar state change originated from.
+  enum BookmarkBarStateChangeReason {
+    // From the constructor.
+    BOOKMARK_BAR_STATE_CHANGE_INIT,
+
+    // Change is the result of the active tab changing.
+    BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH,
+
+    // Change is the result of the bookmark bar pref changing.
+    BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE,
+
+    // Change is the result of a state change in the active tab.
+    BOOKMARK_BAR_STATE_CHANGE_TAB_STATE,
+
+    // Change is the result of window toggling in/out of fullscreen mode.
+    BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN,
+  };
+
   virtual void FindReply(content::WebContents* tab,
                          int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
                          bool final_update) OVERRIDE;
 
   virtual void RequestToLockMouse(content::WebContents* tab,
                                   bool user_gesture) OVERRIDE;
   virtual void LostMouseLock() OVERRIDE;
@@ skipping 414 matching lines @@
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_