Android: Streamline some infobars code.

1. Don't null-check after pointer cast, because it will never be null
   (unless the DCHECK on the previous line had already failed, however
   this clearly never happens because the same pointer is de-reffed on
   the next line, so we'd have seen crashes)

2. Combine two methods instead of having one method thunk to the other.

Bug: none
Change-Id: Id67f5cf04fda40ec694689452c403601402cc306
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575892
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835607}

chrome/browser/ui/android/infobars/infobar_container_android.cc

@@ -7,7 +7,6 @@
 #include "base/android/jni_android.h"
 #include "base/check.h"
 #include "base/metrics/histogram_functions.h"
-#include "base/notreached.h"
 #include "chrome/android/chrome_jni_headers/InfoBarContainer_jni.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/infobars/android/infobar_android.h"
@@ -45,24 +44,15 @@ void InfoBarContainerAndroid::Destroy(JNIEnv* env,
   delete this;
 }
 
+// Creates the Java equivalent of |android_bar| and add it to the java
+// container.
 void InfoBarContainerAndroid::PlatformSpecificAddInfoBar(
     infobars::InfoBar* infobar,
     size_t position) {
   DCHECK(infobar);
   infobars::InfoBarAndroid* android_bar =
       static_cast<infobars::InfoBarAndroid*>(infobar);
-  if (!android_bar) {
-    // TODO(bulach): CLANK: implement other types of InfoBars.
-    NOTIMPLEMENTED() << "CLANK: infobar identifier "
-                     << infobar->delegate()->GetIdentifier();
-    return;
-  }
-
-  AttachJavaInfoBar(android_bar);
-}
 
-void InfoBarContainerAndroid::AttachJavaInfoBar(
-    infobars::InfoBarAndroid* android_bar) {
   if (android_bar->HasSetJavaInfoBar())
     return;
   JNIEnv* env = base::android::AttachCurrentThread();

chrome/browser/ui/android/infobars/infobar_container_android.h

@@ -16,10 +16,6 @@
 #include "base/macros.h"
 #include "components/infobars/core/infobar_container.h"
 
-namespace infobars {
-class InfoBarAndroid;
-}
-
 class InfoBarContainerAndroid : public infobars::InfoBarContainer {
  public:
   InfoBarContainerAndroid(JNIEnv* env,
@@ -43,10 +39,6 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer {
   void PlatformSpecificReplaceInfoBar(infobars::InfoBar* old_infobar,
                                       infobars::InfoBar* new_infobar) override;
 
-  // Create the Java equivalent of |android_bar| and add it to the java
-  // container.
-  void AttachJavaInfoBar(infobars::InfoBarAndroid* android_bar);
-
   // We're owned by the java infobar, need to use a weak ref so it can destroy
   // us.
   JavaObjectWeakGlobalRef weak_java_infobar_container_;

weblayer/browser/infobar_container_android.cc

@@ -7,7 +7,6 @@
 #include "base/android/jni_android.h"
 #include "base/check.h"
 #include "base/metrics/histogram_functions.h"
-#include "base/notreached.h"
 #include "components/infobars/android/infobar_android.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
@@ -46,24 +45,15 @@ void InfoBarContainerAndroid::Destroy(JNIEnv* env,
   delete this;
 }
 
+// Creates the Java equivalent of |android_bar| and add it to the java
+// container.
 void InfoBarContainerAndroid::PlatformSpecificAddInfoBar(
     infobars::InfoBar* infobar,
     size_t position) {
   DCHECK(infobar);
   infobars::InfoBarAndroid* android_bar =
       static_cast<infobars::InfoBarAndroid*>(infobar);
-  if (!android_bar) {
-    // TODO(bulach): CLANK: implement other types of InfoBars.
-    NOTIMPLEMENTED() << "CLANK: infobar identifier "
-                     << infobar->delegate()->GetIdentifier();
-    return;
-  }
-
-  AttachJavaInfoBar(android_bar);
-}
 
-void InfoBarContainerAndroid::AttachJavaInfoBar(
-    infobars::InfoBarAndroid* android_bar) {
   if (android_bar->HasSetJavaInfoBar())
     return;
   JNIEnv* env = base::android::AttachCurrentThread();

weblayer/browser/infobar_container_android.h

@@ -16,10 +16,6 @@
 #include "base/macros.h"
 #include "components/infobars/core/infobar_container.h"
 
-namespace infobars {
-class InfoBarAndroid;
-}
-
 namespace weblayer {
 
 class InfoBarContainerAndroid : public infobars::InfoBarContainer {
@@ -44,10 +40,6 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer {
   void PlatformSpecificReplaceInfoBar(infobars::InfoBar* old_infobar,
                                       infobars::InfoBar* new_infobar) override;
 
-  // Create the Java equivalent of |android_bar| and add it to the java
-  // container.
-  void AttachJavaInfoBar(infobars::InfoBarAndroid* android_bar);
-
   // We're owned by the java infobar, need to use a weak ref so it can destroy
   // us.
   JavaObjectWeakGlobalRef weak_java_infobar_container_;