Reorganize net/disk_cache into backend specific directories.

net/disk_cache/v2/histogram_macros.h

 // 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.
 
 // This file contains macros to simplify histogram reporting from the disk
 // cache. The main issue is that we want to have separate histograms for each
 // type of cache (regular vs. media, etc), without adding the complexity of
 // keeping track of a potentially large number of histogram objects that have to
 // survive the backend object that created them.
 
-#ifndef NET_DISK_CACHE_HISTOGRAM_MACROS_H_
-#define NET_DISK_CACHE_HISTOGRAM_MACROS_H_
+#ifndef NET_DISK_CACHE_V2_HISTOGRAM_MACROS_H_
+#define NET_DISK_CACHE_V2_HISTOGRAM_MACROS_H_
 
 // -----------------------------------------------------------------------------
 
 // These histograms follow the definition of UMA_HISTOGRAMN_XXX except that
 // whenever the name changes (the experiment group changes), the histrogram
 // object is re-created.
 // Note: These macros are only run on one thread, so the declarations of
 // |counter| was made static (i.e., there will be no race for reinitialization).
 
 #define CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count) \
@@ skipping 54 matching lines @@
                                  (base::Time::Now() - initial_time).InHours())
 
 // HISTOGRAM_AGE_MS will collect time elapsed since |initial_time|, with the
 // normal resolution of the UMA_HISTOGRAM_TIMES.
 #define CACHE_HISTOGRAM_AGE_MS(name, initial_time)\
     CACHE_HISTOGRAM_TIMES(name, base::TimeTicks::Now() - initial_time)
 
 #define CACHE_HISTOGRAM_CACHE_ERROR(name, sample) \
     CACHE_HISTOGRAM_ENUMERATION(name, sample, 50)
 
-#ifdef NET_DISK_CACHE_BACKEND_IMPL_CC_
+#ifdef NET_DISK_CACHE_V2_BACKEND_IMPL_CC_

[rvargas (doing something else), 2014/02/06 04:21:23]

no version prefix

[gavinp, 2014/02/09 15:13:35]

This problematic #define is being dealt with in an upstream review now, see
https://codereview.chromium.org/140893013/

 #define BACKEND_OBJ this
 #else
 #define BACKEND_OBJ backend_
 #endif
 
 // Generates a UMA histogram of the given type, generating the proper name for
 // it (asking backend_->HistogramName), and adding the provided sample.
 // For example, to generate a regualar UMA_HISTOGRAM_COUNTS, this macro would
 // be used as:
 //  CACHE_UMA(COUNTS, "MyName", 0, 20);
@@ skipping 19 matching lines @@
         break;\
       case net::PNACL_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       default:\
         NOTREACHED();\
         break;\
     }\
   }
 
-#endif  // NET_DISK_CACHE_HISTOGRAM_MACROS_H_
+#endif  // NET_DISK_CACHE_V2_HISTOGRAM_MACROS_H_