summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 19:05:46 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 19:05:46 +0000
commitc091c2c92ee26788d063f939297312f9b43f1df2 (patch)
tree5ea5ed64e088477b8f77e458f63634f6d4124576 /chrome/browser/dom_ui
parentc5ef91caf12d91c53e3b7bd8ced24f549c4c5485 (diff)
downloadchromium_src-c091c2c92ee26788d063f939297312f9b43f1df2.zip
chromium_src-c091c2c92ee26788d063f939297312f9b43f1df2.tar.gz
chromium_src-c091c2c92ee26788d063f939297312f9b43f1df2.tar.bz2
Fixed crash in DOM UI setup caused by lazy instantiation of the
DOMUIBindings. Added helper functions to lazily instantiate both DOMUIBindings and ExternalHostBindings and call them from all access sites in render_view. Also incorporated re-enabling of InputFileTriggerFileBrowse test thanks to xiyuan in http://codereview.chromium.org/3466001 . BUG=55959 TEST=none Review URL: http://codereview.chromium.org/3412011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/file_browse_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc
index d775e1c..c8d7a1f 100644
--- a/chrome/browser/dom_ui/file_browse_browsertest.cc
+++ b/chrome/browser/dom_ui/file_browse_browsertest.cc
@@ -102,7 +102,7 @@ class FileBrowseUiObserver : public NotificationObserver {
DISALLOW_COPY_AND_ASSIGN(FileBrowseUiObserver);
};
-IN_PROC_BROWSER_TEST_F(FileBrowseBrowserTest, FAILS_InputFileTriggerFileBrowse) {
+IN_PROC_BROWSER_TEST_F(FileBrowseBrowserTest, InputFileTriggerFileBrowse) {
ASSERT_TRUE(test_server()->Start());
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/input_file.html"));