Breaks compile on Linux Aura

chrome/browser/bookmarks/bookmark_extension_api.cc

Index: chrome/browser/bookmarks/bookmark_extension_api.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_extension_api.cc	(revision 144942)
+++ chrome/browser/bookmarks/bookmark_extension_api.cc	(working copy)
@@ -31,7 +31,6 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
@@ -876,16 +875,14 @@
   // Balanced in one of the three callbacks of SelectFileDialog:
   // either FileSelectionCanceled, MultiFilesSelected, or FileSelected
   AddRef();
-
-  WebContents* web_contents = dispatcher()->delegate()->
-      GetAssociatedWebContents();
-
-  select_file_dialog_ = SelectFileDialog::Create(
-      this, new ChromeSelectFilePolicy(web_contents));
+  select_file_dialog_ = SelectFileDialog::Create(this);
   SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
 
+  WebContents* web_contents = dispatcher()->delegate()->
+      GetAssociatedWebContents();
+
   // |tab_contents| can be NULL (for background pages), which is fine. In such
   // a case if file-selection dialogs are forbidden by policy, we will not
   // show an InfoBar, which is better than letting one appear out of the blue.
@@ -895,6 +892,7 @@
                                   &file_type_info,
                                   0,
                                   FILE_PATH_LITERAL(""),
+                                  web_contents,
                                   NULL,
                                   NULL);
 }
Property changes on: chrome\browser\bookmarks\bookmark_extension_api.cc
___________________________________________________________________
Deleted: svn:mergeinfo