15 files changed, 19 insertions, 11 deletions
diff --git a/chrome/android/java/res/drawable-hdpi/ic_collapse.png b/chrome/android/java/res/drawable-hdpi/ic_collapsed.png
index 6a08d2a..6a08d2a 100644
--- a/chrome/android/java/res/drawable-hdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-hdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-hdpi/ic_expand.png b/chrome/android/java/res/drawable-hdpi/ic_expanded.png
index d9a7dc4..d9a7dc4 100644
--- a/chrome/android/java/res/drawable-hdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-hdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-mdpi/ic_collapse.png b/chrome/android/java/res/drawable-mdpi/ic_collapsed.png
index 94c6b77..94c6b77 100644
--- a/chrome/android/java/res/drawable-mdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-mdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-mdpi/ic_expand.png b/chrome/android/java/res/drawable-mdpi/ic_expanded.png
index 386af07..386af07 100644
--- a/chrome/android/java/res/drawable-mdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-mdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png
index 6e35277..6e35277 100644
--- a/chrome/android/java/res/drawable-xhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xhdpi/ic_expand.png b/chrome/android/java/res/drawable-xhdpi/ic_expanded.png
index 95c3a27..95c3a27 100644
--- a/chrome/android/java/res/drawable-xhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xhdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png
index 78e8ca1..78e8ca1 100644
--- a/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_expand.png b/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png
index 5844525..5844525 100644
--- a/chrome/android/java/res/drawable-xxhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png
index fb78a61..fb78a61 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_expand.png b/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png
index 483f541..483f541 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
index 9eb2496..9f1f26f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
@@ -71,9 +71,9 @@ public class RecentTabsGroupView extends RelativeLayout {
         // Create drawable for expand/collapse arrow.
         LevelListDrawable collapseIcon = new LevelListDrawable();
         collapseIcon.addLevel(DRAWABLE_LEVEL_COLLAPSED, DRAWABLE_LEVEL_COLLAPSED,
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_expand));
+                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_expanded));
         TintedDrawable collapse =
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapse);
+                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapsed);
         collapse.setTint(
                 ApiCompatibilityUtils.getColorStateList(getResources(), R.color.blue_mode_tint));
         collapseIcon.addLevel(DRAWABLE_LEVEL_EXPANDED, DRAWABLE_LEVEL_EXPANDED, collapse);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 8176d72..89b0d17 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -1216,10 +1216,13 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
                 setUrlToPageUrl();
             }
         }
-
+        int id = getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme());
         // ImageView#setImageResource is no-op if given resource is the current one.
-        mSecurityButton.setImageResource(
-                getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme()));
+        if (id == 0) {
+            mSecurityButton.setImageDrawable(null);
+        } else {
+            mSecurityButton.setImageResource(id);
+        }
 
         if (mSecurityIconType == securityLevel) return;
         mSecurityIconType = securityLevel;
@@ -1289,7 +1292,7 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
                 mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
                 break;
             case EMPTY:
-                mNavigationButton.setImageResource(0);
+                mNavigationButton.setImageDrawable(null);
                 break;
             default:
                 assert false;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
index a7534c4..021ece7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -128,7 +128,7 @@ public class PrivacyPreferences extends PreferenceFragment
         searchSuggestionsPref.setOnPreferenceChangeListener(this);
         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
-        if (!ContextualSearchFieldTrial.isEnabled(getContext())) {
+        if (!ContextualSearchFieldTrial.isEnabled(getActivity())) {
             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
         }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
index 32cd4e9..3942175 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
@@ -250,7 +250,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
         // Set the title and arrow icons for the header.
         allowedGroup.setGroupTitle(resourceId, numAllowed);
         TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),
-                mAllowListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);
+                mAllowListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);
         allowedGroup.setExpanded(mAllowListExpanded);
         allowedGroup.setIcon(icon);
     }
@@ -267,7 +267,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
         // Set the title and arrow icons for the header.
         blockedGroup.setGroupTitle(R.string.website_settings_blocked_group_heading, numBlocked);
         TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),
-                mBlockListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);
+                mBlockListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);
         blockedGroup.setExpanded(mBlockListExpanded);
         blockedGroup.setIcon(icon);
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index df87a09..49b02da 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -367,9 +367,14 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         if (securityLevel == ConnectionSecurityLevel.NONE) {
             mAnimDelegate.hideSecurityButton();
         } else {
+            int id = LocationBarLayout.getSecurityIconResource(
+                    securityLevel, !shouldEmphasizeHttpsScheme());
             // ImageView#setImageResource is no-op if given resource is the current one.
-            mSecurityButton.setImageResource(LocationBarLayout.getSecurityIconResource(
-                    securityLevel, !shouldEmphasizeHttpsScheme()));
+            if (id == 0) {
+                mSecurityButton.setImageDrawable(null);
+            } else {
+                mSecurityButton.setImageResource(id);
+            }
             mAnimDelegate.showSecurityButton();
         }
         mUrlBar.emphasizeUrl();