Merge 182737

chrome/browser/translate/options_menu_model.cc

Index: chrome/browser/translate/options_menu_model.cc
===================================================================
--- chrome/browser/translate/options_menu_model.cc	(revision 183051)
+++ chrome/browser/translate/options_menu_model.cc	(working copy)
@@ -85,18 +85,6 @@
       return (!translate_infobar_delegate_->IsLanguageBlacklisted() &&
           !translate_infobar_delegate_->IsSiteBlacklisted());
 
-    case IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION : {
-      // Until we have a secure URL for reporting language detection errors,
-      // we don't report errors that happened on secure URLs.
-      DCHECK(translate_infobar_delegate_ != NULL);
-      DCHECK(translate_infobar_delegate_->owner() != NULL);
-      DCHECK(translate_infobar_delegate_->owner()->GetWebContents() != NULL);
-      NavigationEntry* entry = translate_infobar_delegate_->owner()->
-          GetWebContents()->GetController().GetActiveEntry();
-      // Delegate and tab contents should never be NULL, but active entry
-      // can be NULL when running tests. We want to return false if NULL.
-      return (entry != NULL) && !entry->GetURL().SchemeIsSecure();
-    }
     default:
       break;
   }