Rename android only infobars

chrome/browser/geolocation/geolocation_infobar_delegate_android.h

Index: chrome/browser/geolocation/geolocation_infobar_delegate_android.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.h b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
similarity index 61%
rename from chrome/browser/geolocation/geolocation_infobar_delegate.h
rename to chrome/browser/geolocation/geolocation_infobar_delegate_android.h
index 1afa546a7ba63fce2e26490191b3ba44a1535af9..87aab1bce62fd3fdf664bdadb3a3a05f18fc1513 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
@@ -2,32 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
+#define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <string>
 
+#include "base/macros.h"
 #include "chrome/browser/permissions/permission_infobar_delegate.h"
 
-// GeolocationInfoBarDelegates are created by the
+// GeolocationInfoBarDelegateAndroidAndroids are created by the
 // PermissionQueueController to control the display
 // and handling of geolocation permission infobars to the user.
-class GeolocationInfoBarDelegate :  public PermissionInfobarDelegate {
+class GeolocationInfoBarDelegateAndroidAndroid

[mlamouri (slow - plz ping), 2015/10/26 17:11:36]

I think you have one Android too many here.

[Evan Stade, 2015/10/26 18:28:29]

thanks, created a CL to fix it.

+    : public PermissionInfobarDelegate {
  public:
   // Creates a geolocation infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
-  static infobars::InfoBar* Create(
-      InfoBarService* infobar_service,
-      const GURL& requesting_frame,
-      const std::string& display_languages,
-      const PermissionSetCallback& callback);
+  static infobars::InfoBar* Create(InfoBarService* infobar_service,
+                                   const GURL& requesting_frame,
+                                   const std::string& display_languages,
+                                   const PermissionSetCallback& callback);
 
  private:
-  GeolocationInfoBarDelegate(
+  GeolocationInfoBarDelegateAndroidAndroid(
       const GURL& requesting_frame,
       const std::string& display_languages,
       const PermissionSetCallback& callback);
-  ~GeolocationInfoBarDelegate() override;
+  ~GeolocationInfoBarDelegateAndroidAndroid() override;
 
   // PermissionInfoBarDelegate:
   int GetIconId() const override;
@@ -36,7 +37,7 @@ class GeolocationInfoBarDelegate :  public PermissionInfobarDelegate {
   GURL requesting_frame_;
   std::string display_languages_;
 
-  DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegate);
+  DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroidAndroid);
 };
 
-#endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
+#endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_