Transfer user agent override info between browser and renderer

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 493 matching lines @@
     bool swapped_out,
     int32 next_page_id,
     const WebKit::WebScreenInfo& screen_info,
     content::GuestToEmbedderChannel* guest_to_embedder_channel,
     AccessibilityMode accessibility_mode)
     : RenderWidget(WebKit::WebPopupTypeNone, screen_info, swapped_out),
       webkit_preferences_(webkit_prefs),
       send_content_state_immediately_(false),
       enabled_bindings_(0),
       send_preferred_size_changes_(false),
+      is_overriding_user_agent_(false),
       is_loading_(false),
       navigation_gesture_(NavigationGestureUnknown),
       opened_by_user_gesture_(true),
       opener_suppressed_(false),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       next_page_id_(next_page_id),
       history_list_offset_(-1),
       history_list_length_(0),
       target_url_status_(TARGET_NONE),
@@ skipping 485 matching lines @@
     return;
 
   // Swap this renderer back in if necessary.
   if (is_swapped_out_) {
     // We marked the view as hidden when swapping the view out, so be sure to
     // reset the visibility state before navigating to the new URL.
     webview()->setVisibilityState(visibilityState(), false);
     SetSwappedOut(false);
   }
 
+  // Track whether we're using the user agent string override.
+  is_overriding_user_agent_ = params.is_overriding_user_agent;
+
   history_list_offset_ = params.current_history_list_offset;
   history_list_length_ = params.current_history_list_length;
   if (history_list_length_ >= 0)
     history_page_ids_.resize(history_list_length_, -1);
   if (params.pending_history_list_offset >= 0 &&
       params.pending_history_list_offset < history_list_length_)
     history_page_ids_[params.pending_history_list_offset] = params.page_id;
 
   content::GetContentClient()->SetActiveURL(params.url);
 
@@ skipping 412 matching lines @@
           original_request.httpHeaderField(WebString::fromUTF8("Referer"))),
           GetReferrerPolicyFromRequest(frame, original_request));
     }
 
     string16 method = request.httpMethod();
     if (EqualsASCII(method, "POST")) {
       params.is_post = true;
       params.post_id = ExtractPostId(item);
     }
 
+    // Send the user agent override back.
+    params.is_overriding_user_agent = is_overriding_user_agent_;
+
     // Save some histogram data so we can compute the average memory used per
     // page load of the glyphs.
     UMA_HISTOGRAM_COUNTS_10000("Memory.GlyphPagesPerLoad",
                                webkit_glue::GetGlyphPageCount());
 
     // This message needs to be sent before any of allowScripts(),
     // allowImages(), allowPlugins() is called for the new page, so that when
     // these functions send a ViewHostMsg_ContentBlocked message, it arrives
     // after the ViewHostMsg_FrameNavigate message.
     Send(new ViewHostMsg_FrameNavigate(routing_id_, params));
@@ skipping 2231 matching lines @@
 
   Send(new ViewHostMsg_RouteMessageEvent(routing_id_, params));
   return true;
 }
 
 void RenderViewImpl::willOpenSocketStream(
     WebSocketStreamHandle* handle) {
   SocketStreamHandleData::AddToHandle(handle, routing_id_);
 }
 
+WebKit::WebString RenderViewImpl::userAgentOverride(const WebKit::WebURL& url) {

[darin (slow to review), 2012/06/15 04:09:22]

nit: please list methods in the .cc file in the same order as they appear in the
.h file.  it appears that this method should follow
willCheckAndDispatchMessageEvent.

[gone, 2012/06/15 21:22:36]

Oddly, willCheckAndDispatchMessageEvent() is in the wrong place.  I'm flipping
the order to fix it for the next patch.

+  if (!is_overriding_user_agent_ ||
+      renderer_preferences_.user_agent_override.empty())
+    return WebKit::WebString();
+
+  return WebString::fromUTF8(renderer_preferences_.user_agent_override);
+}
+
 // WebKit::WebPageSerializerClient implementation ------------------------------
 
 void RenderViewImpl::didSerializeDataForFrame(
     const WebURL& frame_url,
     const WebCString& data,
     WebPageSerializerClient::PageSerializationStatus status) {
   Send(new ViewHostMsg_SendSerializedHtmlData(
     routing_id(),
     frame_url,
     data.data(),
@@ skipping 1915 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }