Rename enums/functions that collide in chromium style.

third_party/WebKit/Source/platform/network/ResourceRequest.cpp

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 59 matching lines @@
     m_uiStartTime = data->m_uiStartTime;
     m_originatesFromReservedIPRange = data->m_originatesFromReservedIPRange;
     m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy;
     m_followedRedirect = data->m_followedRedirect;
 }
 
 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
 {
     OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());
     data->m_url = url().copy();
-    data->m_cachePolicy = cachePolicy();
+    data->m_cachePolicy = getCachePolicy();
     data->m_timeoutInterval = timeoutInterval();
     data->m_firstPartyForCookies = firstPartyForCookies().copy();
     data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCopy() : nullptr;
     data->m_httpMethod = httpMethod().string().isolatedCopy();
     data->m_httpHeaders = httpHeaderFields().copyData();
     data->m_priority = priority();
     data->m_intraPriorityValue = m_intraPriorityValue;
 
     if (m_httpBody)
         data->m_httpBody = m_httpBody->deepCopy();
@@ skipping 45 matching lines @@
 
 void ResourceRequest::removeCredentials()
 {
     if (m_url.user().isEmpty() && m_url.pass().isEmpty())
         return;
 
     m_url.setUser(String());
     m_url.setPass(String());
 }
 
-ResourceRequestCachePolicy ResourceRequest::cachePolicy() const
+ResourceRequestCachePolicy ResourceRequest::getCachePolicy() const
 {
     return m_cachePolicy;
 }
 
 void ResourceRequest::setCachePolicy(ResourceRequestCachePolicy cachePolicy)
 {
     m_cachePolicy = cachePolicy;
 }
 
 double ResourceRequest::timeoutInterval() const
@@ skipping 161 matching lines @@
 void ResourceRequest::clearHTTPHeaderField(const AtomicString& name)
 {
     m_httpHeaderFields.remove(name);
 }
 
 bool equalIgnoringHeaderFields(const ResourceRequest& a, const ResourceRequest& b)
 {
     if (a.url() != b.url())
         return false;
 
-    if (a.cachePolicy() != b.cachePolicy())
+    if (a.getCachePolicy() != b.getCachePolicy())
         return false;
 
     if (a.timeoutInterval() != b.timeoutInterval())
         return false;
 
     if (a.firstPartyForCookies() != b.firstPartyForCookies())
         return false;
 
     if (a.httpMethod() != b.httpMethod())
         return false;
@@ skipping 100 matching lines @@
     m_didSetHTTPReferrer = false;
     m_checkForBrowserSideNavigation = true;
     m_uiStartTime = 0;
     m_originatesFromReservedIPRange = false;
     m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
     m_followedRedirect = false;
     m_requestorOrigin = SecurityOrigin::createUnique();
 }
 
 } // namespace blink