Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2040)

Unified Diff: chrome/browser/extensions/updater/extension_updater_unittest.cc

Issue 829583002: Validate hash_sha256 checksum on .crx update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unittest build for windows. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/updater/extension_updater_unittest.cc
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index b1e2f519bba8afe62902d3803079427389b04e4b..6afb075540a054647ca6721cb54839fe0375b94a 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -145,13 +145,13 @@ class MockExtensionDownloaderDelegate : public ExtensionDownloaderDelegate {
Error,
const PingResult&,
const std::set<int>&));
- MOCK_METHOD7(OnExtensionDownloadFinished, void(const std::string&,
- const base::FilePath&,
- bool,
- const GURL&,
- const std::string&,
- const PingResult&,
- const std::set<int>&));
+ MOCK_METHOD6(OnExtensionDownloadFinished,
+ void(const extensions::CRXFileInfo&,
+ bool,
+ const GURL&,
+ const std::string&,
+ const PingResult&,
+ const std::set<int>&));
MOCK_METHOD2(GetPingDataForExtension,
bool(const std::string&, ManifestFetchData::PingData*));
MOCK_METHOD1(GetUpdateUrlData, std::string(const std::string&));
@@ -175,9 +175,10 @@ class MockExtensionDownloaderDelegate : public ExtensionDownloaderDelegate {
ON_CALL(*this, OnExtensionDownloadFailed(_, _, _, _))
.WillByDefault(Invoke(delegate,
&ExtensionDownloaderDelegate::OnExtensionDownloadFailed));
- ON_CALL(*this, OnExtensionDownloadFinished(_, _, _, _, _, _, _))
- .WillByDefault(Invoke(delegate,
- &ExtensionDownloaderDelegate::OnExtensionDownloadFinished));
+ ON_CALL(*this, OnExtensionDownloadFinished(_, _, _, _, _, _))
+ .WillByDefault(
+ Invoke(delegate,
+ &ExtensionDownloaderDelegate::OnExtensionDownloadFinished));
ON_CALL(*this, GetPingDataForExtension(_, _))
.WillByDefault(Invoke(delegate,
&ExtensionDownloaderDelegate::GetPingDataForExtension));
@@ -499,15 +500,14 @@ class ServiceForDownloadTests : public MockService {
fake_crx_installers_[id] = crx_installer;
}
- bool UpdateExtension(const std::string& id,
- const base::FilePath& extension_path,
+ bool UpdateExtension(const CRXFileInfo& file,
bool file_ownership_passed,
CrxInstaller** out_crx_installer) override {
- extension_id_ = id;
- install_path_ = extension_path;
+ extension_id_ = file.extension_id;
+ install_path_ = file.path;
- if (ContainsKey(fake_crx_installers_, id)) {
- *out_crx_installer = fake_crx_installers_[id];
+ if (ContainsKey(fake_crx_installers_, extension_id_)) {
+ *out_crx_installer = fake_crx_installers_[extension_id_];
return true;
}
@@ -1221,7 +1221,8 @@ class ExtensionUpdaterTest : public testing::Test {
fetcher->set_response_code(200);
fetcher->SetResponseFilePath(extension_file_path);
EXPECT_CALL(delegate, OnExtensionDownloadFinished(
- id, _, _, _, version.GetString(), _, requests));
+ CRXFileInfo(id, extension_file_path, hash), _,
+ _, version.GetString(), _, requests));
}
fetcher->delegate()->OnURLFetchComplete(fetcher);
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.cc ('k') | chrome/common/extensions/update_manifest_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698