Ignore viewport meta tags when Request Desktop Site is enabled.

content/browser/frame_host/navigation_controller_android.h

Index: content/browser/frame_host/navigation_controller_android.h
diff --git a/content/browser/frame_host/navigation_controller_android.h b/content/browser/frame_host/navigation_controller_android.h
index f2ec9058d954d0b2e09dca827dbe85b5dd3cbc74..701bc9a521106fa4c47be44ebaf64e049914a3d0 100644
--- a/content/browser/frame_host/navigation_controller_android.h
+++ b/content/browser/frame_host/navigation_controller_android.h
@@ -14,7 +14,7 @@
 
 namespace content {
 
-class NavigationController;
+class NavigationControllerImpl;
 
 // Android wrapper around NavigationController that provides safer passage
 // from java and back to native and provides java with a means of communicating
@@ -24,10 +24,10 @@ class CONTENT_EXPORT NavigationControllerAndroid {
   static bool Register(JNIEnv* env);
 
   explicit NavigationControllerAndroid(
-      NavigationController* navigation_controller);
+      NavigationControllerImpl* navigation_controller);
   ~NavigationControllerAndroid();
 
-  NavigationController* navigation_controller() const {
+  NavigationControllerImpl* navigation_controller() const {
     return navigation_controller_;
   }
 
@@ -140,7 +140,7 @@ class CONTENT_EXPORT NavigationControllerAndroid {
                              jboolean replace_entry);
 
  private:
-  NavigationController* navigation_controller_;
+  NavigationControllerImpl* navigation_controller_;
   base::android::ScopedJavaGlobalRef<jobject> obj_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationControllerAndroid);