Merge 144659 - fix horizontal scrollbar flicker on uber page

chrome/browser/resources/uber/uber.css

 /* 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. */
 
+body {
+  /* http://crbug.com/129406 --- horizontal scrollbars flicker when changing
+   * sections. */
+  overflow-x: hidden;
+}
+
 #navigation {
   height: 100%;
   left: 0;
   /* This is a hack to prevent the navigation bar from occluding pointer events
    * from the bottom scroll bar (which shows when one needs to horizontally
    * scroll). Corresponding padding-top to offset this is in uber_frame.css */
   margin-top: -20px;
   position: absolute;
   /* This value is different from the left value to compensate for the scroll
    * bar (which is always on and to the right) in RTL. */
@@ skipping 33 matching lines @@
 .iframe-container.expanded {
   left: 0;
 }
 
 iframe {
   border: none;
   display: block;
   height: 100%;
   width: 100%;
 }