CrOS - Fix file picker to route callbacks using TabContents

chrome/browser/ui/views/extensions/extension_dialog.cc

Index: chrome/browser/ui/views/extensions/extension_dialog.cc
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc
index aadb4c591cecd7909b4a09289d51486e25d33bc4..d263eb2475742db66f43dc86351218af8f533d1c 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog.cc
@@ -54,6 +54,7 @@ ExtensionDialog::~ExtensionDialog() {
 ExtensionDialog* ExtensionDialog::Show(
     const GURL& url,
     Browser* browser,
+    TabContents* tab_contents,
     int width,
     int height,
     ExtensionDialogObserver* observer) {
@@ -64,7 +65,9 @@ ExtensionDialog* ExtensionDialog::Show(
   if (!manager)
     return NULL;
   ExtensionHost* host = manager->CreateDialogHost(url, browser);
-  DCHECK(host);
+  if (!host)
+    return NULL;
+  host->set_associated_tab_contents(tab_contents);
   return new ExtensionDialog(browser, host, width, height, observer);
 }