Revert of Use only toolbar to transition from fakebox to real omnibox.

chrome/android/java/res/values/dimens.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 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. -->
 
 <resources>
     <!-- Connection info popup dimensions -->
     <dimen name="connection_info_padding_wide">24dp</dimen>
     <dimen name="connection_info_padding_thin">16dp</dimen>
 
@@ skipping 202 matching lines @@
     <dimen name="webapp_splash_small_title_margin_top">32dp</dimen>
     <dimen name="webapp_splash_large_title_margin_bottom">16dp</dimen>
 
     <!-- Toolbar dimensions -->
     <dimen name="toolbar_tab_count_text_size_1_digit">12dp</dimen>
     <dimen name="toolbar_tab_count_text_size_2_digit">10dp</dimen>
     <dimen name="toolbar_height_no_shadow">56dp</dimen>
     <dimen name="toolbar_progress_bar_height">2dp</dimen>
     <dimen name="toolbar_button_width">48dp</dimen>
 
+    <dimen name="location_bar_margin_top">5dp</dimen>
+    <dimen name="location_bar_margin_bottom">5dp</dimen>
+
     <dimen name="toolbar_edge_padding">8dp</dimen>
-    <dimen name="location_bar_vertical_margin">8dp</dimen>
     <dimen name="location_bar_url_text_size">16sp</dimen>
     <dimen name="location_bar_incognito_badge_padding">7dp</dimen>
-    <dimen name="location_bar_icon_width">32dp</dimen>
-    <dimen name="location_bar_corner_radius">1dp</dimen>
 
+    <dimen name="location_bar_icon_width">36dp</dimen>
     <dimen name="tablet_toolbar_start_padding">4dp</dimen>
     <dimen name="tablet_toolbar_start_padding_no_buttons">6dp</dimen>
     <dimen name="tablet_toolbar_end_padding">6dp</dimen>
     <dimen name="location_bar_status_separator_width">1dp</dimen>
     <!-- Offset applied to the toolbar menu button in document mode to align with the menu
          positioned inside the omnibox. -->
     <dimen name="document_toolbar_menu_offset">5dp</dimen>
 
     <!-- Omnibox suggestions -->
     <dimen name="omnibox_suggestion_height">60dp</dimen>
@@ skipping 21 matching lines @@
     <dimen name="most_visited_vertical_spacing">3dp</dimen>
     <dimen name="most_visited_min_horizontal_spacing">4dp</dimen>
     <dimen name="most_visited_max_horizontal_spacing">16dp</dimen>
     <dimen name="most_visited_tile_width">80dp</dimen>
     <dimen name="most_visited_icon_size">48dp</dimen>
     <dimen name="most_visited_offline_badge_size">24dp</dimen>
     <dimen name="ntp_logo_height">116dp</dimen>
     <dimen name="ntp_search_box_material_margin_left">10dp</dimen>
     <dimen name="ntp_search_box_material_margin_right">10dp</dimen>
     <dimen name="ntp_search_box_material_margin_top">0dp</dimen>
-    <dimen name="ntp_search_box_material_margin_bottom">1dp</dimen>
-    <dimen name="ntp_search_box_material_height">62dp</dimen>
+    <dimen name="ntp_search_box_material_margin_bottom">5dp</dimen>
+    <dimen name="ntp_search_box_material_height">54dp</dimen>
     <dimen name="ntp_search_box_material_extra_width">4dp</dimen>
     <dimen name="ntp_search_box_material_padding_top">3dp</dimen>
     <dimen name="ntp_search_box_material_padding_bottom">3dp</dimen>
     <dimen name="ntp_search_box_material_padding_left">2dp</dimen>
     <dimen name="ntp_search_box_material_padding_right">2dp</dimen>
     <dimen name="ntp_search_box_transition_length">16dp</dimen>
     <dimen name="ntp_wide_card_lateral_margins">48dp</dimen>
     <dimen name="ntp_list_item_padding">16dp</dimen>
     <dimen name="ntp_list_item_min_height">48dp</dimen>
     <dimen name="ntp_list_item_text_size">16sp</dimen>
@@ skipping 82 matching lines @@
          padding set.
     -->
     <dimen name="pref_autofill_content_spacing">12dp</dimen>
     <dimen name="pref_autofill_field_horizontal_padding">4dp</dimen>
     <dimen name="pref_autofill_field_top_margin">8dp</dimen>
 
     <!-- Dialog dimensions.
          https://www.google.com/design/spec/components/dialogs.html#dialogs-simple-dialogs -->
     <dimen name="dialog_width_unit">56dp</dimen>  <!-- MD dialog widths are multiples of this. -->
 </resources>