diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 18:18:16 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 18:18:16 +0000 |
| commit | 192c2244899a255a154ae79eb2db23fdc6242c51 (patch) | |
| tree | 71e1f1bf8587631b4704ae4fb009aff2e0a03310 | |
| parent | 4deb745bea1e37c47c7e63ac42a1dee0dadb1a51 (diff) | |
| download | chromium_src-192c2244899a255a154ae79eb2db23fdc6242c51.zip chromium_src-192c2244899a255a154ae79eb2db23fdc6242c51.tar.gz chromium_src-192c2244899a255a154ae79eb2db23fdc6242c51.tar.bz2 | |
Followup to address post-commit comments on 9041015
http://codereview.chromium.org/9041015/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116684 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/net/crl_set_fetcher.cc | 6 | ||||
| -rw-r--r-- | net/base/crl_set.cc | 3 | ||||
| -rw-r--r-- | net/base/crl_set.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index ca9aee5..74c179a 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -163,7 +163,7 @@ bool CRLSetFetcher::Install(base::DictionaryValue* manifest, bool is_delta; if (!net::CRLSet::GetIsDeltaUpdate(crl_set_bytes, &is_delta)) { - LOG(WARNING) << "IsDeltaUpdate failed on CRL set from update CRX"; + LOG(WARNING) << "GetIsDeltaUpdate failed on CRL set from update CRX"; return false; } @@ -176,7 +176,7 @@ bool CRLSetFetcher::Install(base::DictionaryValue* manifest, crl_set_bytes.size())) { LOG(WARNING) << "Failed to save new CRL set to disk"; // We don't return false here because we can still use this CRL set. When - // we restart we might revert to an older version, then then we'll + // we restart we might revert to an older version, then we'll // advertise the older version to Omaha and everything will still work. } } else { @@ -192,7 +192,7 @@ bool CRLSetFetcher::Install(base::DictionaryValue* manifest, new_crl_set_bytes.size())) { LOG(WARNING) << "Failed to save new CRL set to disk"; // We don't return false here because we can still use this CRL set. When - // we restart we might revert to an older version, then then we'll + // we restart we might revert to an older version, then we'll // advertise the older version to Omaha and everything will still work. } crl_set_ = new_crl_set; diff --git a/net/base/crl_set.cc b/net/base/crl_set.cc index 9414870..528d476 100644 --- a/net/base/crl_set.cc +++ b/net/base/crl_set.cc @@ -311,8 +311,9 @@ bool ReadDeltaCRL(base::StringPiece* data, return true; } -bool CRLSet::ApplyDelta(base::StringPiece data, +bool CRLSet::ApplyDelta(const base::StringPiece& in_data, scoped_refptr<CRLSet>* out_crl_set) { + base::StringPiece data(in_data); scoped_ptr<DictionaryValue> header_dict(ReadHeader(&data)); if (!header_dict.get()) return false; diff --git a/net/base/crl_set.h b/net/base/crl_set.h index ab67d3d..a41cf0c 100644 --- a/net/base/crl_set.h +++ b/net/base/crl_set.h @@ -48,7 +48,7 @@ class NET_EXPORT CRLSet : public base::RefCountedThreadSafe<CRLSet> { // ApplyDelta returns a new CRLSet in |out_crl_set| that is the result of // updating the current CRL set with the delta information in |delta_bytes|. - bool ApplyDelta(base::StringPiece delta_bytes, + bool ApplyDelta(const base::StringPiece& delta_bytes, scoped_refptr<CRLSet>* out_crl_set); // GetIsDeltaUpdate extracts the header from |bytes|, sets *is_delta to |