🔍 Refactor LocationBarLayout to fix SearchActivity's location bar

chrome/android/java/res/layout/location_bar_base.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+<!-- Copyright 2017 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. -->
 
-<!-- The location bar also know as URL bar -->
+<!-- Layout for the control group representing Chrome's URL bar on small devices.
+     This file is used for different LocationBarLayout subclasses and should remain generic.
+-->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The container for the Google G is kept at a fixed width to make the horizonal translation
-         calculations work. The contents are end-aligned, so when the location bar expands,
-         the space in the start margin will be pushed out, creating the effect of both margins
-         shrinking simultaneously. -->
-    <FrameLayout android:id="@+id/google_g_container"
-        android:layout_width="@dimen/location_bar_google_g_container_width"
-        android:layout_height="match_parent" >
-
-        <ImageView android:id="@+id/google_g"
-            style="@style/LocationBarButton"
-            android:layout_width="@dimen/location_bar_google_g_width"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="@dimen/location_bar_google_g_margin"
-            android:layout_gravity="end"
-            android:scaleType="fitCenter"
-            android:src="@drawable/googleg"
-            android:contentDescription="@null" />
-
-    </FrameLayout>
-
     <ImageView android:id="@+id/incognito_badge"
         style="@style/LocationBarButton"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:scaleType="center"
         android:src="@drawable/ic_omnibox_incognito_badge"
         android:contentDescription="@null"
         android:visibility="gone" />
 
     <FrameLayout android:id="@+id/location_bar_icon"
@@ skipping 56 matching lines @@
             style="@style/LocationBarButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="center"
             android:src="@drawable/btn_mic"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_mic" />
 
     </FrameLayout>
 </merge>