diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 18:39:38 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 18:39:38 +0000 |
| commit | 805eaa313253c3dcf96985f5945097316045d66d (patch) | |
| tree | ee3ce51b7d21e30cecc8c0d2c868377562d75b9c | |
| parent | 51f14a3192290c9c4cfb6c9bad953e9ad1102f48 (diff) | |
| download | chromium_src-805eaa313253c3dcf96985f5945097316045d66d.zip chromium_src-805eaa313253c3dcf96985f5945097316045d66d.tar.gz chromium_src-805eaa313253c3dcf96985f5945097316045d66d.tar.bz2 | |
Fix tree
Avoid carrying across planned to leak flag, which will cause
a DCHECK in the browser process.
tbr=mbelshe,raman.tenneti
Review URL: http://codereview.chromium.org/503016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34575 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/histogram.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/histogram.cc b/base/histogram.cc index b421156d..d55c84f 100644 --- a/base/histogram.cc +++ b/base/histogram.cc @@ -464,7 +464,8 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) { histogram_name; } else { render_histogram->AddSampleSet(sample); - render_histogram->SetFlags(flags & ~kIPCSerializationSourceFlag); + render_histogram->SetFlags(flags & ~kIPCSerializationSourceFlag + & ~kPlannedLeakFlag); } return true; |