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

Unified Diff: extensions/browser/content_verify_job.cc

Issue 1226163010: Fix content verifier problem with content scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged latest head Created 5 years, 5 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
« no previous file with comments | « extensions/browser/content_verifier.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/content_verify_job.cc
diff --git a/extensions/browser/content_verify_job.cc b/extensions/browser/content_verify_job.cc
index 651dcae47b62ddd974d73527a253426996de5db3..efd763eaf7294e48e7b7fd59267a2405d5ae7137 100644
--- a/extensions/browser/content_verify_job.cc
+++ b/extensions/browser/content_verify_job.cc
@@ -132,12 +132,13 @@ void ContentVerifyJob::DoneReading() {
}
}
done_reading_ = true;
- if (hashes_ready_ && !FinishBlock())
- DispatchFailureCallback(HASH_MISMATCH);
-
- if (!failed_ && g_test_observer)
- g_test_observer->JobFinished(
- hash_reader_->extension_id(), hash_reader_->relative_path(), failed_);
+ if (hashes_ready_) {
+ if (!FinishBlock())
+ DispatchFailureCallback(HASH_MISMATCH);
+ else if (g_test_observer)
+ g_test_observer->JobFinished(hash_reader_->extension_id(),
+ hash_reader_->relative_path(), failed_);
+ }
}
bool ContentVerifyJob::FinishBlock() {
@@ -182,6 +183,10 @@ void ContentVerifyJob::OnHashesReady(bool success) {
ScopedElapsedTimer timer(&time_spent_);
if (!FinishBlock())
DispatchFailureCallback(HASH_MISMATCH);
+ else if (g_test_observer) {
+ g_test_observer->JobFinished(hash_reader_->extension_id(),
+ hash_reader_->relative_path(), failed_);
+ }
}
}
« no previous file with comments | « extensions/browser/content_verifier.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698