Centralize the setting of Accept headers

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 284 matching lines @@
 
 #if defined(OS_ANDROID)
 using blink::WebFloatPoint;
 using blink::WebFloatRect;
 #endif
 
 namespace content {
 
 namespace {
 
-const char kDefaultAcceptHeader[] =
-    "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/"
-    "*;q=0.8";
-const char kAcceptHeader[] = "Accept";
-
 const size_t kExtraCharsBeforeAndAfterSelection = 100;
 
 typedef std::map<int, RenderFrameImpl*> RoutingIDFrameMap;
 static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map =
     LAZY_INSTANCE_INITIALIZER;
 
 typedef std::map<blink::WebFrame*, RenderFrameImpl*> FrameMap;
 base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER;
 
 int64_t ExtractPostId(const WebHistoryItem& item) {
@@ skipping 3431 matching lines @@
     requested_with = old_extra_data->requested_with();
     if (!requested_with.isNull()) {
       if (requested_with.isEmpty())
         request.clearHTTPHeaderField("X-Requested-With");
       else
         request.setHTTPHeaderField("X-Requested-With", requested_with);
     }
     stream_override = old_extra_data->TakeStreamOverrideOwnership();
   }
 
-  // Add the default accept header for frame request if it has not been set
-  // already.
-  if ((request.getFrameType() == blink::WebURLRequest::FrameTypeTopLevel ||
-       request.getFrameType() == blink::WebURLRequest::FrameTypeNested) &&
-      request.httpHeaderField(WebString::fromUTF8(kAcceptHeader)).isEmpty()) {
-    request.setHTTPHeaderField(WebString::fromUTF8(kAcceptHeader),
-                               WebString::fromUTF8(kDefaultAcceptHeader));
-  }
-
   // Add an empty HTTP origin header for non GET methods if none is currently
   // present.
   request.addHTTPOriginIfNeeded(WebString());
 
   // Attach |should_replace_current_entry| state to requests so that, should
   // this navigation later require a request transfer, all state is preserved
   // when it is re-created in the new process.
   bool should_replace_current_entry = data_source->replacesCurrentHistoryItem();
 
   int provider_id = kInvalidServiceWorkerProviderId;
@@ skipping 2261 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content