diff options
| -rw-r--r-- | chrome/browser/extensions/extension_management_browsertest.cc | 5 | ||||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v1.crx | bin | 939 -> 3020 bytes | |||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v1/background.html | 5 | ||||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v1/manifest.json | 4 | ||||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v2.crx | bin | 941 -> 3218 bytes | |||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v2/background.html | 5 | ||||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v2/manifest.json | 4 | ||||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v3.crx | bin | 941 -> 3006 bytes | |||
| -rw-r--r-- | chrome/test/data/extensions/autoupdate/v3/manifest.json | 3 |
9 files changed, 17 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index 01348c9..ff94bfa 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extensions_service.h" +#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" @@ -208,10 +209,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdate) { basedir.AppendASCII("v2.crx")); // Install version 1 of the extension. + ExtensionTestMessageListener listener1("v1 installed"); ExtensionsService* service = browser()->profile()->GetExtensionsService(); const size_t size_before = service->extensions()->size(); ASSERT_TRUE(service->disabled_extensions()->empty()); ASSERT_TRUE(InstallExtension(basedir.AppendASCII("v1.crx"), 1)); + listener1.WaitUntilSatisfied(); const ExtensionList* extensions = service->extensions(); ASSERT_EQ(size_before + 1, extensions->size()); ASSERT_TRUE(service->HasInstalledExtensions()); @@ -223,8 +226,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdate) { service->updater()->set_blacklist_checks_enabled(false); // Run autoupdate and make sure version 2 of the extension was installed. + ExtensionTestMessageListener listener2("v2 installed"); service->updater()->CheckNow(); ASSERT_TRUE(WaitForExtensionInstall()); + listener2.WaitUntilSatisfied(); extensions = service->extensions(); ASSERT_EQ(size_before + 1, extensions->size()); ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", diff --git a/chrome/test/data/extensions/autoupdate/v1.crx b/chrome/test/data/extensions/autoupdate/v1.crx Binary files differindex 9ce53af..09cb670 100644 --- a/chrome/test/data/extensions/autoupdate/v1.crx +++ b/chrome/test/data/extensions/autoupdate/v1.crx diff --git a/chrome/test/data/extensions/autoupdate/v1/background.html b/chrome/test/data/extensions/autoupdate/v1/background.html new file mode 100644 index 0000000..0045511 --- /dev/null +++ b/chrome/test/data/extensions/autoupdate/v1/background.html @@ -0,0 +1,5 @@ +<script> +window.onload = function() { + chrome.test.sendMessage("v1 installed"); +}; +</script> diff --git a/chrome/test/data/extensions/autoupdate/v1/manifest.json b/chrome/test/data/extensions/autoupdate/v1/manifest.json index e16b878..3b20de4 100644 --- a/chrome/test/data/extensions/autoupdate/v1/manifest.json +++ b/chrome/test/data/extensions/autoupdate/v1/manifest.json @@ -1,9 +1,7 @@ { "description": "Extension for Auto-Update testing", "name": "Auto-Update Test", - "toolstrips": [ - "toolstrip.html" - ], "version": "1.0", + "background_page": "background.html", "update_url": "http://localhost/autoupdate/manifest" } diff --git a/chrome/test/data/extensions/autoupdate/v2.crx b/chrome/test/data/extensions/autoupdate/v2.crx Binary files differindex 1af10cb..d95930d 100644 --- a/chrome/test/data/extensions/autoupdate/v2.crx +++ b/chrome/test/data/extensions/autoupdate/v2.crx diff --git a/chrome/test/data/extensions/autoupdate/v2/background.html b/chrome/test/data/extensions/autoupdate/v2/background.html new file mode 100644 index 0000000..4d038c4 --- /dev/null +++ b/chrome/test/data/extensions/autoupdate/v2/background.html @@ -0,0 +1,5 @@ +<script> +window.onload = function() { + chrome.test.sendMessage("v2 installed"); +}; +</script> diff --git a/chrome/test/data/extensions/autoupdate/v2/manifest.json b/chrome/test/data/extensions/autoupdate/v2/manifest.json index d654aab..312b94d 100644 --- a/chrome/test/data/extensions/autoupdate/v2/manifest.json +++ b/chrome/test/data/extensions/autoupdate/v2/manifest.json @@ -1,9 +1,7 @@ { "description": "Extension for Auto-Update testing", "name": "Auto-Update Test", - "toolstrips": [ - "toolstrip.html" - ], "version": "2.0", + "background_page": "background.html", "update_url": "http://localhost/autoupdate/manifest" } diff --git a/chrome/test/data/extensions/autoupdate/v3.crx b/chrome/test/data/extensions/autoupdate/v3.crx Binary files differindex b976e74..a3f09a8 100644 --- a/chrome/test/data/extensions/autoupdate/v3.crx +++ b/chrome/test/data/extensions/autoupdate/v3.crx diff --git a/chrome/test/data/extensions/autoupdate/v3/manifest.json b/chrome/test/data/extensions/autoupdate/v3/manifest.json index 5761024..6c747b0 100644 --- a/chrome/test/data/extensions/autoupdate/v3/manifest.json +++ b/chrome/test/data/extensions/autoupdate/v3/manifest.json @@ -1,9 +1,6 @@ { "description": "Extension for Auto-Update testing", "name": "Auto-Update Test", - "toolstrips": [ - "toolstrip.html" - ], "version": "3.0", "update_url": "http://localhost/autoupdate/manifest" } |