Rename enums/functions that collide in chromium style.

chrome/renderer/chrome_content_renderer_client.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/chrome_content_renderer_client.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
@@ skipping 1037 matching lines @@
 void ChromeContentRendererClient::GetNavigationErrorStrings(
     content::RenderFrame* render_frame,
     const blink::WebURLRequest& failed_request,
     const blink::WebURLError& error,
     std::string* error_html,
     base::string16* error_description) {
   const GURL failed_url = error.unreachableURL;
 
   bool is_post = base::EqualsASCII(
       base::StringPiece16(failed_request.httpMethod()), "POST");
-  bool is_ignoring_cache = failed_request.cachePolicy() ==
+  bool is_ignoring_cache = failed_request.getCachePolicy() ==
                            blink::WebURLRequest::ReloadBypassingCache;
   if (error_html) {
     NetErrorHelper::Get(render_frame)
         ->GetErrorHTML(error, is_post, is_ignoring_cache, error_html);
   }
 
   if (error_description) {
     *error_description = error_page::LocalizedError::GetErrorDetails(
         error.domain.utf8(), error.reason, is_post);
   }
@@ skipping 350 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
   return !IsStandaloneExtensionProcess();
 #else
   return true;
 #endif
 }
 
 base::StringPiece ChromeContentRendererClient::GetOriginTrialPublicKey() {
   return origin_trial_key_manager_.GetPublicKey();
 }