Ignore viewport meta tags when Request Desktop Site is enabled.

content/browser/frame_host/navigation_controller_android.cc

Index: content/browser/frame_host/navigation_controller_android.cc
diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc
index 96aceacc0708c7c7219ea3cbe3a87fc38b7c966f..72e2879a4f79ffffc172805bf40517d5c6b34169 100644
--- a/content/browser/frame_host/navigation_controller_android.cc
+++ b/content/browser/frame_host/navigation_controller_android.cc
@@ -9,9 +9,10 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/render_view_host.h"

[nasko, 2016/04/08 22:32:35]

Why is this header needed? I don't see any new code referencing RenderViewHost.

[aelias_OOO_until_Jul13, 2016/04/08 23:31:36]

Removed.

 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "jni/NavigationControllerImpl_jni.h"
 #include "net/base/data_url.h"
@@ -76,7 +77,7 @@ bool NavigationControllerAndroid::Register(JNIEnv* env) {
 }
 
 NavigationControllerAndroid::NavigationControllerAndroid(
-    NavigationController* navigation_controller)
+    NavigationControllerImpl* navigation_controller)
     : navigation_controller_(navigation_controller) {
   JNIEnv* env = AttachCurrentThread();
   obj_.Reset(env,
@@ -355,6 +356,7 @@ void NavigationControllerAndroid::SetUseDesktopUserAgent(
 
   // Set the flag in the NavigationEntry.
   entry->SetIsOverridingUserAgent(enabled);
+  navigation_controller_->delegate()->UpdateOverridingUserAgent();
 
   // Send the override to the renderer.
   if (reload_on_state_change) {