diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 20:03:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 20:03:23 +0000 |
| commit | 8adbf7e5d0af7fec5d3fde8d472716739d3183fc (patch) | |
| tree | c4210f0d8e9c01ad49cbe48f8c4fcaa56fa9d891 /chrome_frame/test/data | |
| parent | d17054237974d50db49c10d18a05a42048478db7 (diff) | |
| download | chromium_src-8adbf7e5d0af7fec5d3fde8d472716739d3183fc.zip chromium_src-8adbf7e5d0af7fec5d3fde8d472716739d3183fc.tar.gz chromium_src-8adbf7e5d0af7fec5d3fde8d472716739d3183fc.tar.bz2 | |
Recommit of the ill-fated r44474, this time with new compiling goodness.
Add multi-version delegation to Chrome Frame such that CF will scan for older versions on load and delegate to them. This is to support clean upgrade scenarios whereby a new version is registered while IE is running.
BUG=40117
TEST=Register a new CF version while an old one is loaded in IE. Open a few new tabs and observe nothing bad happening.
TBR=tommi
Review URL: http://codereview.chromium.org/1585037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
| -rw-r--r-- | chrome_frame/test/data/test_dlls/1/TestDll.dll | bin | 0 -> 12800 bytes | |||
| -rw-r--r-- | chrome_frame/test/data/test_dlls/2/TestDll.dll | bin | 0 -> 12800 bytes | |||
| -rw-r--r-- | chrome_frame/test/data/test_dlls/3/TestDll.dll | bin | 0 -> 12800 bytes | |||
| -rw-r--r-- | chrome_frame/test/data/test_dlls/DummyCF/npchrome_frame.dll | bin | 0 -> 12800 bytes | |||
| -rw-r--r-- | chrome_frame/test/data/test_dlls/README | 7 | ||||
| -rw-r--r-- | chrome_frame/test/data/test_dlls/TestDllNoCF/TestDll.dll | bin | 0 -> 7680 bytes |
6 files changed, 7 insertions, 0 deletions
diff --git a/chrome_frame/test/data/test_dlls/1/TestDll.dll b/chrome_frame/test/data/test_dlls/1/TestDll.dll Binary files differnew file mode 100644 index 0000000..9658de1 --- /dev/null +++ b/chrome_frame/test/data/test_dlls/1/TestDll.dll diff --git a/chrome_frame/test/data/test_dlls/2/TestDll.dll b/chrome_frame/test/data/test_dlls/2/TestDll.dll Binary files differnew file mode 100644 index 0000000..9501cac --- /dev/null +++ b/chrome_frame/test/data/test_dlls/2/TestDll.dll diff --git a/chrome_frame/test/data/test_dlls/3/TestDll.dll b/chrome_frame/test/data/test_dlls/3/TestDll.dll Binary files differnew file mode 100644 index 0000000..007ba36 --- /dev/null +++ b/chrome_frame/test/data/test_dlls/3/TestDll.dll diff --git a/chrome_frame/test/data/test_dlls/DummyCF/npchrome_frame.dll b/chrome_frame/test/data/test_dlls/DummyCF/npchrome_frame.dll Binary files differnew file mode 100644 index 0000000..a616fcc --- /dev/null +++ b/chrome_frame/test/data/test_dlls/DummyCF/npchrome_frame.dll diff --git a/chrome_frame/test/data/test_dlls/README b/chrome_frame/test/data/test_dlls/README new file mode 100644 index 0000000..5db353c --- /dev/null +++ b/chrome_frame/test/data/test_dlls/README @@ -0,0 +1,7 @@ +This directory contains dummy DLLs intended to support testing of the module
+scanning code currently in Chrome Frame (in module_utils.cc at time of writing).
+
+The DLLs contain no code of mention and export a DllGetClassObject function.
+The only main difference between them is that they have different version
+numbers in the FileVersion and ProductVersion fields of their
+VS_VERSION_INFO resources.
\ No newline at end of file diff --git a/chrome_frame/test/data/test_dlls/TestDllNoCF/TestDll.dll b/chrome_frame/test/data/test_dlls/TestDllNoCF/TestDll.dll Binary files differnew file mode 100644 index 0000000..cbdffcc --- /dev/null +++ b/chrome_frame/test/data/test_dlls/TestDllNoCF/TestDll.dll |