Clean up dependencies for disk_cache histogram_macros.h.

net/disk_cache/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.
 
@@ skipping 66 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_
-#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);
 //  CACHE_UMA(COUNTS, "MyExperiment", 530, 55);
 // which roughly translates to:
 //  UMA_HISTOGRAM_COUNTS("DiskCache.2.MyName", 20);  // "2" is the CacheType.
 //  UMA_HISTOGRAM_COUNTS("DiskCache.2.MyExperiment_530", 55);
 //
 #define CACHE_UMA(type, name, experiment, sample) {\
-    const std::string my_name = BACKEND_OBJ->HistogramName(name, experiment);\
-    switch (BACKEND_OBJ->cache_type()) {\
+    const std::string my_name =\
+        CACHE_UMA_BACKEND_IMPL_OBJ->HistogramName(name, experiment);\
+    switch (CACHE_UMA_BACKEND_IMPL_OBJ->cache_type()) {\
       case net::DISK_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       case net::MEDIA_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       case net::APP_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       case net::SHADER_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       case net::PNACL_CACHE:\
         CACHE_HISTOGRAM_##type(my_name.data(), sample);\
         break;\
       default:\
         NOTREACHED();\
         break;\
     }\
   }
 
 #endif  // NET_DISK_CACHE_HISTOGRAM_MACROS_H_