Fixed memory leak. Untangled confusing code with menu initialization and ownership.

chrome/browser/ui/views/reload_button.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_VIEWS_RELOAD_BUTTON_H__
 #define CHROME_BROWSER_UI_VIEWS_RELOAD_BUTTON_H__
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/timer.h"
@@ skipping 56 matching lines @@
   virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
 
  private:
   friend class ReloadButtonTest;
 
-  ui::SimpleMenuModel* CreateMenuModel();
-
   void ExecuteBrowserCommand(int command, int event_flags);
   void ChangeModeInternal(Mode mode);
 
   void OnDoubleClickTimer();
   void OnStopToReloadTimer();
 
   base::OneShotTimer<ReloadButton> double_click_timer_;
   base::OneShotTimer<ReloadButton> stop_to_reload_timer_;
 
   // These may be NULL when testing.
   LocationBarView* location_bar_;
   CommandUpdater* command_updater_;
 
   // The mode we should be in assuming no timers are running.
   Mode intended_mode_;
 
   // The currently-visible mode - this may differ from the intended mode.
   Mode visible_mode_;
 
   // The delay times for the timers.  These are members so that tests can modify
   // them.
   base::TimeDelta double_click_timer_delay_;
   base::TimeDelta stop_to_reload_timer_delay_;
 
   // Indicates if reload menu is enabled.
   bool menu_enabled_;
 
+  // The model that populates the attached menu.
+  scoped_ptr<ui::SimpleMenuModel> menu_model_;
+
   // The parent class's images_ member is used for the current images,
   // and this array is used to hold the alternative images.
   // We swap between the two when changing mode.
   gfx::ImageSkia alternate_images_[BS_COUNT];
 
   // TESTING ONLY
   // True if we should pretend the button is hovered.
   bool testing_mouse_hovered_;
   // Increments when we would tell the browser to "reload", so
   // test code can tell whether we did so (as there may be no |browser_|).
   int testing_reload_count_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ReloadButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_RELOAD_BUTTON_H__