summaryrefslogtreecommitdiffstats
path: root/chrome/browser/performance_monitor
diff options
context:
space:
mode:
authormsimonides@opera.com <msimonides@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 12:03:33 +0000
committermsimonides@opera.com <msimonides@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 12:03:33 +0000
commit5206ae88cd5b226471a304c7f5b2740a6a7bfe79 (patch)
tree4d65e1b52b75c2a922afbeff38f02b40ada6bc9d /chrome/browser/performance_monitor
parentcd579f088339420404891ea0cb116e95bbb1c2c1 (diff)
downloadchromium_src-5206ae88cd5b226471a304c7f5b2740a6a7bfe79.zip
chromium_src-5206ae88cd5b226471a304c7f5b2740a6a7bfe79.tar.gz
chromium_src-5206ae88cd5b226471a304c7f5b2740a6a7bfe79.tar.bz2
Create CrxInstaller directly in WebstoreInstaller
The WebstoreInstaller needs a way to keep track of extensions being downloaded and installed. The installation is handled by CrxInstaller but when it used to be created automatically by the ChromeDownloadManagerDelegate, the WebstoreInstaller had little control over it and needed the CrxInstaller to keep the original_download_url as sort of an identifier. With this change the WebstoreInstaller creates the CrxInstaller itself and keeps a pointer to it so there is no more need for CrxInstaller::original_download_url(). This is also more robust because URLs are not unique identifiers (there could be two installations run simultaneously for one download URL which would have led to a crash in the old code). BUG=360487 Review URL: https://codereview.chromium.org/226023003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor')
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 51d0133..61096ee 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -474,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, UpdateExtensionEvent) {
chrome::NOTIFICATION_CRX_INSTALLER_DONE,
content::Source<extensions::CrxInstaller>(crx_installer));
ASSERT_TRUE(extension_service->
- UpdateExtension(extension->id(), path_v2_, true, GURL(), &crx_installer));
+ UpdateExtension(extension->id(), path_v2_, true, &crx_installer));
windowed_observer.Wait();
extension = extension_service->GetExtensionById(