summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 22:14:28 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 22:14:28 +0000
commit03b5f7d2de18b78060e48c8734f9b068d86b713f (patch)
tree65aae02770845c8d77d76d2cd0fe6f70beafc49f /chrome/test/pyautolib
parent6aa614a9ac971f5b027eee0749f211883f1d6934 (diff)
downloadchromium_src-03b5f7d2de18b78060e48c8734f9b068d86b713f.zip
chromium_src-03b5f7d2de18b78060e48c8734f9b068d86b713f.tar.gz
chromium_src-03b5f7d2de18b78060e48c8734f9b068d86b713f.tar.bz2
[pyauto] Force plugin load at startup
Trying to load .pdf/.swf files immediately after browser startup leads to them being downloaded instead. This seems to hint that the plugins haven't been registered yet. A call to GetPluginsInfo() would force registering of the plugins. BUG=94123, 110761 R=dennisjeffrey@chromium.org TEST= Review URL: https://chromiumcodereview.appspot.com/9159025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rwxr-xr-xchrome/test/pyautolib/pyauto.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 8f15d5d..58714d9 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -194,6 +194,12 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
# on ChromeOS).
self.SetUp()
+ # Forcibly trigger all plugins to get registered. crbug.com/94123
+ # Sometimes flash files loaded too quickly after firing browser
+ # ends up getting downloaded, which seems to indicate that the plugin
+ # hasn't been registered yet.
+ self.GetPluginsInfo()
+
# TODO(dtu): Remove this after crosbug.com/4558 is fixed.
if self.IsChromeOS():
self.WaitUntil(lambda: not self.GetNetworkInfo()['offline_mode'])