Fix accessibity tab switcher tabs not reading content description

Bug: 886975
Change-Id: Ic4717d4fc2fbac73137f65154b3055332f9c23ed
Reviewed-on: https://chromium-review.googlesource.com/1244612Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594138}

chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelWrapper.java

@@ -109,27 +109,24 @@ public class AccessibilityTabModelWrapper extends LinearLayout {
         mStandardButtonIcon = new TintedImageView(getContext());
         mStandardButtonIcon.setImageResource(R.drawable.btn_normal_tabs);
         mStandardButtonIcon.setScaleY(-1.0f);
+        mStandardButtonIcon.setContentDescription(
+                getResources().getString(R.string.accessibility_tab_switcher_standard_stack));
         mIncognitoButtonIcon = new TintedImageView(getContext());
         mIncognitoButtonIcon.setImageResource(R.drawable.btn_incognito_tabs);
         mIncognitoButtonIcon.setScaleY(-1.0f);
+        mIncognitoButtonIcon.setContentDescription(getResources().getString(
+                ChromeFeatureList.isEnabled(ChromeFeatureList.INCOGNITO_STRINGS)
+                        ? R.string.accessibility_tab_switcher_private_stack
+                        : R.string.accessibility_tab_switcher_incognito_stack));
 
         setDividerDrawable(null);
         ((ListView) findViewById(R.id.list_view)).setDivider(null);
 
         mLayout = findViewById(R.id.tab_wrapper);
         mStackButtonWrapper = findViewById(R.id.tab_layout);
-        mStandardButton =
-                mStackButtonWrapper.newTab()
-                        .setCustomView(mStandardButtonIcon)
-                        .setContentDescription(R.string.accessibility_tab_switcher_standard_stack);
+        mStandardButton = mStackButtonWrapper.newTab().setCustomView(mStandardButtonIcon);
         mStackButtonWrapper.addTab(mStandardButton);
-        mIncognitoButton =
-                mStackButtonWrapper.newTab()
-                        .setCustomView(mIncognitoButtonIcon)
-                        .setContentDescription(
-                                ChromeFeatureList.isEnabled(ChromeFeatureList.INCOGNITO_STRINGS)
-                                        ? R.string.accessibility_tab_switcher_private_stack
-                                        : R.string.accessibility_tab_switcher_incognito_stack);
+        mIncognitoButton = mStackButtonWrapper.newTab().setCustomView(mIncognitoButtonIcon);
         mStackButtonWrapper.addTab(mIncognitoButton);
         mStackButtonWrapper.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override