Transfer user agent override info between browser and renderer

content/browser/web_contents/web_contents_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/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 208 matching lines @@
   params->transition = entry.GetTransitionType();
   params->state = entry.GetContentState();
   params->navigation_type =
       GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
   params->request_time = base::Time::Now();
   params->extra_headers = entry.extra_headers();
   params->transferred_request_child_id =
       entry.transferred_global_request_id().child_id;
   params->transferred_request_request_id =
       entry.transferred_global_request_id().request_id;
+  params->is_overriding_user_agent = entry.GetIsOverridingUserAgent();
   // Avoid downloading when in view-source mode.
   params->allow_download = !entry.IsViewSourceMode();
   params->embedder_channel_name = embedder_channel_name;
   params->embedder_container_id = embedder_container_id;
 
   if (delegate)
     delegate->AddNavigationHeaders(params->url, &params->extra_headers);
 }
 
 int GetSwitchValueAsInt(
@@ skipping 500 matching lines @@
 content::WebUI* WebContentsImpl::GetWebUI() const {
   return render_manager_.web_ui() ? render_manager_.web_ui()
       : render_manager_.pending_web_ui();
 }
 
 content::WebUI* WebContentsImpl::GetCommittedWebUI() const {
   return render_manager_.web_ui();
 }
 
 void WebContentsImpl::SetUserAgentOverride(const std::string& override) {
-  user_agent_override_ = override;
+  if (GetUserAgentOverride() == override) {

[Charlie Reis, 2012/06/19 22:47:59]

nit: No braces needed on a one-line if.  (Ditto below.)

[gone, 2012/06/20 00:01:10]

Done.

+    return;
+  }
+  renderer_preferences_.user_agent_override = override;
+
+  // Send the new override string to the renderer.
+  RenderViewHost* host = GetRenderViewHost();
+  if (host) {
+    host->SyncRendererPrefs();
+  }
+
+  // Reload the page if a load is currently in progress to avoid having
+  // different parts of the page loaded using different user agents.
+  NavigationEntry* entry = controller_.GetActiveEntry();
+  if (is_loading_ && entry != NULL && entry->GetIsOverridingUserAgent()) {
+    controller_.ReloadIgnoringCache(true);
+  }
 }
 
 const std::string& WebContentsImpl::GetUserAgentOverride() const {
-  return user_agent_override_;
+  return renderer_preferences_.user_agent_override;
 }
 
 const string16& WebContentsImpl::GetTitle() const {
   // Transient entries take precedence. They are used for interstitial pages
   // that are shown on top of existing pages.
   NavigationEntry* entry = controller_.GetTransientEntry();
   std::string accept_languages =
       content::GetContentClient()->browser()->GetAcceptLangs(
           GetBrowserContext());
   if (entry) {
@@ skipping 2270 matching lines @@
       browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }