diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /net/disk_cache/stats.h | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2 | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'net/disk_cache/stats.h')
| -rw-r--r-- | net/disk_cache/stats.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/disk_cache/stats.h b/net/disk_cache/stats.h index ebf0bc2..1f5aa59 100644 --- a/net/disk_cache/stats.h +++ b/net/disk_cache/stats.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/disk_cache/stats_histogram.h" namespace disk_cache { @@ -86,7 +86,7 @@ class Stats { uint32 storage_addr_; int data_sizes_[kDataSizesLength]; int64 counters_[MAX_COUNTER]; - scoped_refptr<StatsHistogram> size_histogram_; + StatsHistogram* size_histogram_; DISALLOW_COPY_AND_ASSIGN(Stats); }; |