Merge 167819 - Fix crash when programatically closing media gallery dialog

chrome/browser/media_gallery/media_galleries_dialog_controller.h

Index: chrome/browser/media_gallery/media_galleries_dialog_controller.h
===================================================================
--- chrome/browser/media_gallery/media_galleries_dialog_controller.h	(revision 168041)
+++ chrome/browser/media_gallery/media_galleries_dialog_controller.h	(working copy)
@@ -76,14 +76,12 @@
                                 bool enabled);
   virtual void DialogFinished(bool accepted);
   virtual const KnownGalleryPermissions& permissions() const;
+  virtual content::WebContents* web_contents() const;
 
   // SelectFileDialog::Listener implementation:
   virtual void FileSelected(const FilePath& path,
                             int index,
                             void* params) OVERRIDE;
-  content::WebContents* web_contents() const {
-    return web_contents_;
-  }
 
  protected:
   // For use with tests.