Use string for Histogram names since these are all ASCII anyway wide-characte...

chrome/browser/safe_browsing/safe_browsing_database_bloom.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database_bloom.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 73 matching lines @@
   // If we're missing either of the database or filter files, we wait until the
   // next update to generate a new filter.
   // TODO(paulg): Investigate how often the filter file is missing and how
   // expensive it would be to regenerate it.
   int64 size_64;
   if (!file_util::GetFileSize(filename_, &size_64) || size_64 == 0)
     return;
 
   if (!file_util::GetFileSize(bloom_filter_filename_, &size_64) ||
       size_64 == 0) {
-    UMA_HISTOGRAM_COUNTS(L"SB2.FilterMissing", 1);
+    UMA_HISTOGRAM_COUNTS("SB2.FilterMissing", 1);
     return;
   }
 
   // We have a bloom filter file, so use that as our filter.
   int size = static_cast<int>(size_64);
   char* data = new char[size];
   CHECK(data);
 
   Time before = Time::Now();
   file_util::ReadFile(bloom_filter_filename_, data, size);
@@ skipping 291 matching lines @@
     } else {
       while (!chunk.hosts.empty()) {
         chunk.hosts.front().entry->Destroy();
         chunk.hosts.pop_front();
       }
     }
 
     chunks->pop_front();
   }
 
-  UMA_HISTOGRAM_TIMES(L"SB2.ChunkInsert", base::Time::Now() - insert_start);
+  UMA_HISTOGRAM_TIMES("SB2.ChunkInsert", base::Time::Now() - insert_start);
 
   delete chunks;
 
   if (chunk_inserted_callback_.get())
     chunk_inserted_callback_->Run();
 }
 
 bool SafeBrowsingDatabaseBloom::UpdateStarted() {
   DCHECK(insert_transaction_.get() == NULL);
 
@@ skipping 892 matching lines @@
 
   // Save the chunk numbers we've received to the database for reporting in
   // future update requests.
   if (!WriteChunkNumbers())
     return;
 
   // Commit all the changes to the database.
   int rv = insert_transaction_->Commit();
   if (rv != SQLITE_OK) {
     NOTREACHED() << "SafeBrowsing update transaction failed to commit.";
-    UMA_HISTOGRAM_COUNTS(L"SB2.FailedUpdate", 1);
+    UMA_HISTOGRAM_COUNTS("SB2.FailedUpdate", 1);
     return;
   }
 
   // Swap in the newly built filter and cache. If there were any matching subs,
   // the size (add_count_) will be smaller.
   {
     AutoLock lock(lookup_lock_);
     add_count_ = new_count;
     bloom_filter_ = filter;
     hash_cache_.swap(add_cache);
   }
 
   TimeDelta bloom_gen = Time::Now() - before;
 
   // Persist the bloom filter to disk.
   WriteBloomFilter();
 
   // Gather statistics.
 #if defined(OS_WIN)
   metric->GetIOCounters(&io_after);
-  UMA_HISTOGRAM_COUNTS(L"SB2.BuildReadBytes",
+  UMA_HISTOGRAM_COUNTS("SB2.BuildReadBytes",
                        static_cast<int>(io_after.ReadTransferCount -
                                         io_before.ReadTransferCount));
-  UMA_HISTOGRAM_COUNTS(L"SB2.BuildWriteBytes",
+  UMA_HISTOGRAM_COUNTS("SB2.BuildWriteBytes",
                        static_cast<int>(io_after.WriteTransferCount -
                                         io_before.WriteTransferCount));
-  UMA_HISTOGRAM_COUNTS(L"SB2.BuildReadOperations",
+  UMA_HISTOGRAM_COUNTS("SB2.BuildReadOperations",
                        static_cast<int>(io_after.ReadOperationCount -
                                         io_before.ReadOperationCount));
-  UMA_HISTOGRAM_COUNTS(L"SB2.BuildWriteOperations",
+  UMA_HISTOGRAM_COUNTS("SB2.BuildWriteOperations",
                        static_cast<int>(io_after.WriteOperationCount -
                                         io_before.WriteOperationCount));
 #endif
   SB_DLOG(INFO) << "SafeBrowsingDatabaseImpl built bloom filter in "
                 << bloom_gen.InMilliseconds()
                 << " ms total.  prefix count: "<< add_count_;
-  UMA_HISTOGRAM_LONG_TIMES(L"SB2.BuildFilter", bloom_gen);
-  UMA_HISTOGRAM_COUNTS(L"SB2.AddPrefixes", add_count_);
-  UMA_HISTOGRAM_COUNTS(L"SB2.SubPrefixes", subs);
+  UMA_HISTOGRAM_LONG_TIMES("SB2.BuildFilter", bloom_gen);
+  UMA_HISTOGRAM_COUNTS("SB2.AddPrefixes", add_count_);
+  UMA_HISTOGRAM_COUNTS("SB2.SubPrefixes", subs);
   int64 size_64;
   if (file_util::GetFileSize(filename_, &size_64))
-    UMA_HISTOGRAM_COUNTS(L"SB2.DatabaseBytes", static_cast<int>(size_64));
+    UMA_HISTOGRAM_COUNTS("SB2.DatabaseBytes", static_cast<int>(size_64));
 }
 
 void SafeBrowsingDatabaseBloom::GetCachedFullHashes(
     const std::vector<SBPrefix>* prefix_hits,
     std::vector<SBFullHashResult>* full_hits,
     Time last_update) {
   DCHECK(prefix_hits && full_hits);
 
   Time max_age = Time::Now() - TimeDelta::FromMinutes(kMaxStalenessMinutes);
 
@@ skipping 115 matching lines @@
   if (did_resume_) {
     PlatformThread::Sleep(kOnResumeHoldupMs);
     did_resume_ = false;
   }
 }
 
 // This database is always synchronous since we don't need to worry about
 // blocking any incoming reads.
 void SafeBrowsingDatabaseBloom::SetSynchronous() {
 }