Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

chrome/renderer/page_load_histograms.cc

 // Copyright (c) 2012 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/renderer/page_load_histograms.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 421 matching lines @@
             "PLT.BeginToFinish_LinkLoadCacheOnly", "GlobalSdch"),
             begin_to_finish_all_loads);
         break;
       default:
         break;
     }
   }
 
   // TODO(mpcomplete): remove the extension-related histograms after we collect
   // enough data. http://crbug.com/100411
-  chrome::ChromeContentRendererClient* client =
-      static_cast<chrome::ChromeContentRendererClient*>(
-          content::GetContentClient()->renderer());
-
-  const bool use_adblock_histogram = client->IsAdblockInstalled();
+  const bool use_adblock_histogram =
+      chrome::ChromeContentRendererClient::IsAdblockInstalled();
   if (use_adblock_histogram) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_ExtensionAdblock",
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case DocumentState::NORMAL_LOAD:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_NormalLoad_ExtensionAdblock",
             begin_to_finish_all_loads);
         break;
@@ skipping 10 matching lines @@
       case DocumentState::LINK_LOAD_CACHE_STALE_OK:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_LinkLoadStaleOk_ExtensionAdblock",
             begin_to_finish_all_loads);
         break;
       default:
         break;
     }
   }
 
-  const bool use_adblockplus_histogram = client->IsAdblockPlusInstalled();
+  const bool use_adblockplus_histogram =
+      chrome::ChromeContentRendererClient::IsAdblockPlusInstalled();
   if (use_adblockplus_histogram) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_ExtensionAdblockPlus",
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case DocumentState::NORMAL_LOAD:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_NormalLoad_ExtensionAdblockPlus",
             begin_to_finish_all_loads);
         break;
@@ skipping 11 matching lines @@
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_LinkLoadStaleOk_ExtensionAdblockPlus",
             begin_to_finish_all_loads);
         break;
       default:
         break;
     }
   }
 
   const bool use_webrequest_adblock_histogram =
-      client->IsAdblockWithWebRequestInstalled();
+      chrome::ChromeContentRendererClient::IsAdblockWithWebRequestInstalled();
   if (use_webrequest_adblock_histogram) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_ExtensionWebRequestAdblock",
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case DocumentState::NORMAL_LOAD:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_NormalLoad_ExtensionWebRequestAdblock",
             begin_to_finish_all_loads);
         break;
@@ skipping 11 matching lines @@
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_LinkLoadStaleOk_ExtensionWebRequestAdblock",
             begin_to_finish_all_loads);
         break;
       default:
         break;
     }
   }
 
   const bool use_webrequest_adblockplus_histogram =
-      client->IsAdblockPlusWithWebRequestInstalled();
+      chrome::ChromeContentRendererClient::
+          IsAdblockPlusWithWebRequestInstalled();
   if (use_webrequest_adblockplus_histogram) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_ExtensionWebRequestAdblockPlus",
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case DocumentState::NORMAL_LOAD:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_NormalLoad_ExtensionWebRequestAdblockPlus",
             begin_to_finish_all_loads);
         break;
@@ skipping 11 matching lines @@
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_LinkLoadStaleOk_ExtensionWebRequestAdblockPlus",
             begin_to_finish_all_loads);
         break;
       default:
         break;
     }
   }
 
   const bool use_webrequest_other_histogram =
-      client->IsOtherExtensionWithWebRequestInstalled();
+      chrome::ChromeContentRendererClient::
+          IsOtherExtensionWithWebRequestInstalled();
   if (use_webrequest_other_histogram) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_ExtensionWebRequestOther",
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case DocumentState::NORMAL_LOAD:
         PLT_HISTOGRAM(
             "PLT.BeginToFinish_NormalLoad_ExtensionWebRequestOther",
             begin_to_finish_all_loads);
         break;
@@ skipping 287 matching lines @@
 
   DCHECK(document_state);
   DCHECK(ds);
   GURL url(ds->request().url());
   Time start = document_state->start_load_time();
   Time finish = document_state->finish_load_time();
   // TODO(mbelshe): should we log more stats?
   VLOG(1) << "PLT: " << (finish - start).InMilliseconds() << "ms "
           << url.spec();
 }