Update code to avoid casting pointers to long.

Casting pointers to numeric types other than intptr_t is a potential
security issue. Replaced with casts to intptr_t.

Change-Id: I4905401dcc93b89efad8437b0b6f17412cfe2925
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1765710Reviewed-by: Lutz Justen <ljusten@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Andrei Chulkov <achulkov@google.com>
Cr-Commit-Position: refs/heads/master@{#690416}

chrome/browser/android/download/download_location_dialog_bridge_impl.cc

@@ -15,7 +15,7 @@ DownloadLocationDialogBridgeImpl::DownloadLocationDialogBridgeImpl()
     : is_dialog_showing_(false) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_obj_.Reset(env, Java_DownloadLocationDialogBridge_create(
-                           env, reinterpret_cast<long>(this))
+                           env, reinterpret_cast<intptr_t>(this))
                            .obj());
   DCHECK(!java_obj_.is_null());
 }

chrome/browser/ui/android/overlay/overlay_window_android.cc

@@ -32,15 +32,15 @@ OverlayWindowAndroid::OverlayWindowAndroid(
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_PictureInPictureActivity_createActivity(
-      env, reinterpret_cast<long>(this),
+      env, reinterpret_cast<intptr_t>(this),
       TabAndroid::FromWebContents(controller_->GetInitiatorWebContents())
           ->GetJavaObject());
 }
 
 OverlayWindowAndroid::~OverlayWindowAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_PictureInPictureActivity_onWindowDestroyed(env,
-                                                  reinterpret_cast<long>(this));
+  Java_PictureInPictureActivity_onWindowDestroyed(
+      env, reinterpret_cast<intptr_t>(this));
 }
 
 void OverlayWindowAndroid::OnActivityStart(

chrome/browser/ui/android/passwords/onboarding_dialog_view.cc

@@ -33,7 +33,7 @@ void OnboardingDialogView::Show() {
   ui::WindowAndroid* window_android =
       client_->web_contents()->GetTopLevelNativeWindow();
   java_object_.Reset(Java_OnboardingDialogBridge_create(
-      env, window_android->GetJavaObject(), reinterpret_cast<long>(this)));
+      env, window_android->GetJavaObject(), reinterpret_cast<intptr_t>(this)));
 
   base::string16 onboarding_title =
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_ONBOARDING_TITLE);

chrome/browser/ui/android/passwords/password_generation_dialog_view_android.cc

@@ -29,7 +29,7 @@ PasswordGenerationDialogViewAndroid::PasswordGenerationDialogViewAndroid(
   DCHECK(window_android);
   java_object_.Reset(Java_PasswordGenerationDialogBridge_create(
       base::android::AttachCurrentThread(), window_android->GetJavaObject(),
-      reinterpret_cast<long>(this)));
+      reinterpret_cast<intptr_t>(this)));
 }
 
 PasswordGenerationDialogViewAndroid::~PasswordGenerationDialogViewAndroid() {

components/policy/core/browser/android/policy_converter.cc

@@ -31,8 +31,9 @@ namespace android {
 PolicyConverter::PolicyConverter(const Schema* policy_schema)
     : policy_schema_(policy_schema), policy_bundle_(new PolicyBundle) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  java_obj_.Reset(env, Java_PolicyConverter_create(
-                           env, reinterpret_cast<long>(this)).obj());
+  java_obj_.Reset(
+      env,
+      Java_PolicyConverter_create(env, reinterpret_cast<intptr_t>(this)).obj());
   DCHECK(!java_obj_.is_null());
 }