Ignore viewport meta tags when Request Desktop Site is enabled.

content/public/browser/navigation_controller.h

Index: content/public/browser/navigation_controller.h
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 76d6de2a0a41291667cb5508a90d495c7e42751f..533c9b4c8a9e27cfa32247ed1138f76f06be588d 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -491,6 +491,8 @@ class NavigationController {
   // controller. Useful to reduce memory consumption in low-memory situations.
   virtual void ClearAllScreenshots() = 0;
 
+  virtual void UpdateOverridingUserAgent() = 0;

[nasko, 2016/03/18 21:05:26]

There are no callers of this method outside of content/, right? We don't add
methods to the public interface unless they are needed by other modules.

[aelias_OOO_until_Jul13, 2016/03/18 22:49:18]

On Android the content/ directory boundary doesn't map properly to the DEPS
boundary, so this seemed to be needed.  This is something Daniel and I discussed
earlier this week, we intend to start a project fix this confusion in the longer
term.

[nasko, 2016/03/25 23:29:05]

This should not go here if it is not called from outside of content/. Can you
give me a more detailed explanation of what is the problem with DEPS. Also, if
there is a DEPS issue, can't it be resolved there?

[no sievers, 2016/03/28 19:53:59]

So these call sites are impl-to-impl, right? And unnecessarily rerouted through
the public interface.

I suggest changing NavigationControllerAndroid so it has a pointer to the
NavigationControllerImpl, which you can pass in from the construction call site
in WebContentsAndroid (you can static_cast the WebContents to the
WebContentsImpl and then call WebContentsImpl::GetController()).

[aelias_OOO_until_Jul13, 2016/04/07 03:06:14]

OK, I removed the public method.  (Actually nothing was routed through the
public interface after all, just the "Impl" typing was unnecessarily dropped in
WebContentsAndroid constructor, so by adding it back there I was able to get to
the NavigationControllerImpl without resorting to a static_cast.)

+
  private:
   // This interface should only be implemented inside content.
   friend class NavigationControllerImpl;