Reland Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 888 matching lines @@
           base::i18n::LEFT_TO_RIGHT : base::i18n::RIGHT_TO_LEFT)) {
         // TODO(sky): Figure out why we need the +1.
         suggested_text_bounds.set_x(location_bounds.x() + 1);
         // Use a margin to prevent omnibox text from overlapping suggest text.
         omnibox_view_margin = suggested_text_bounds.width();
       }
       suggested_text_view_->SetBoundsRect(suggested_text_bounds);
     }
   }
 
-  omnibox_view_->SetHorizontalMargins(0, omnibox_view_margin);
+  const gfx::Insets insets = omnibox_view_->GetInsets();
+  omnibox_view_->set_border(views::Border::CreateEmptyBorder(
+      insets.top(), insets.left(), insets.bottom(), omnibox_view_margin));
 
   // Layout |ime_inline_autocomplete_view_| next to the user input.
   if (ime_inline_autocomplete_view_->visible()) {
     int width =
         gfx::GetStringWidth(ime_inline_autocomplete_view_->text(),
                             ime_inline_autocomplete_view_->font_list()) +
         ime_inline_autocomplete_view_->GetInsets().width();
     // All the target languages (IMEs) are LTR, and we do not need to support
     // RTL so far.  In other words, no testable RTL environment so far.
     int x = location_needed_width;
@@ skipping 666 matching lines @@
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
 void LocationBarView::AccessibilitySetValue(const base::string16& new_value) {
   omnibox_view_->SetUserText(new_value, new_value, true);
 }