diff options
author | dyu@chromium.org <dyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 02:12:20 +0000 |
---|---|---|
committer | dyu@chromium.org <dyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 02:12:20 +0000 |
commit | 62feea29980a06eca81dbcfc4f9cda8cffd4521e (patch) | |
tree | c3b34f29d3bbcf81431ba1c7d22da9da7adce146 /chrome/browser/automation | |
parent | 9a81758945ec8b3da1ae0a04c7c830aa1202f70f (diff) | |
download | chromium_src-62feea29980a06eca81dbcfc4f9cda8cffd4521e.zip chromium_src-62feea29980a06eca81dbcfc4f9cda8cffd4521e.tar.gz chromium_src-62feea29980a06eca81dbcfc4f9cda8cffd4521e.tar.bz2 |
Add new functional tests for content settings in images and handlers.
Add HTML pages into data directory specific to tests for images and handlers.
- testImageContentSettings
- testProtocolHandlerRegisteredCorrectly
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/9693017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index b0ebd6c..f9ee0f3 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -2710,7 +2710,11 @@ ListValue* TestingAutomationProvider::GetInfobarsInfo(WebContents* wc) { InfoBarDelegate* infobar = infobar_helper->GetInfoBarDelegateAt(i); if (infobar->AsConfirmInfoBarDelegate()) { // Also covers ThemeInstalledInfoBarDelegate. - infobar_item->SetString("type", "confirm_infobar"); + if (infobar->AsRegisterProtocolHandlerInfoBarDelegate()) { + infobar_item->SetString("type", "rph_infobar"); + } else { + infobar_item->SetString("type", "confirm_infobar"); + } ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate(); infobar_item->SetString("text", confirm_infobar->GetMessageText()); |