Merge 203791 "gesture nav: Disable for M28."

content/browser/web_contents/web_contents_view_aura_browsertest.cc

Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
===================================================================
--- content/browser/web_contents/web_contents_view_aura_browsertest.cc	(revision 204107)
+++ content/browser/web_contents/web_contents_view_aura_browsertest.cc	(working copy)
@@ -86,6 +86,11 @@
       : screenshot_manager_(NULL) {
   }
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitchASCII(switches::kOverscrollHistoryNavigation,
+                                    std::string("1"));
+  }
+
   // Executes the javascript synchronously and makes sure the returned value is
   // freed properly.
   void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) {