Fix reinterpret_cast issues

It looks like these places are using incorrect casting (reinterpret_cast instead of static_cast) for GetUserData. BUG= Review URL: https://codereview.chromium.org/629503004 Cr-Commit-Position: refs/heads/master@{#298743}
Denger-Network · Oct 8, 2014 · 037df0d · 037df0d
1 parent 40720d6
commit 037df0d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -25,7 +25,7 @@ class UserData : public base::SupportsUserData::Data {
       content::WebContents* web_contents) {
     if (!web_contents)
       return NULL;
-    UserData* data = reinterpret_cast<UserData*>(
+    UserData* data = static_cast<UserData*>(
         web_contents->GetUserData(kAwContentsClientBridgeBase));
     return data ? data->contents_ : NULL;
   }

diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
@@ -113,7 +113,7 @@ class AwContentsUserData : public base::SupportsUserData::Data {
   static AwContents* GetContents(WebContents* web_contents) {
     if (!web_contents)
       return NULL;
-    AwContentsUserData* data = reinterpret_cast<AwContentsUserData*>(
+    AwContentsUserData* data = static_cast<AwContentsUserData*>(
         web_contents->GetUserData(kAwContentsUserDataKey));
     return data ? data->contents_ : NULL;
   }

diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
@@ -61,7 +61,7 @@ class AwSettingsUserData : public base::SupportsUserData::Data {
   static AwSettings* GetSettings(content::WebContents* web_contents) {
     if (!web_contents)
       return NULL;
-    AwSettingsUserData* data = reinterpret_cast<AwSettingsUserData*>(
+    AwSettingsUserData* data = static_cast<AwSettingsUserData*>(
         web_contents->GetUserData(kAwSettingsUserDataKey));
     return data ? data->settings_ : NULL;
   }

diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
@@ -53,7 +53,7 @@ PartnerBookmarksShim* PartnerBookmarksShim::BuildForBrowserContext(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PartnerBookmarksShim* data =
-      reinterpret_cast<PartnerBookmarksShim*>(
+      static_cast<PartnerBookmarksShim*>(
           browser_context->GetUserData(kPartnerBookmarksShimUserDataKey));
   if (data)
     return data;

diff --git a/components/navigation_interception/intercept_navigation_delegate.cc b/components/navigation_interception/intercept_navigation_delegate.cc
@@ -56,7 +56,7 @@ void InterceptNavigationDelegate::Associate(
 // static
 InterceptNavigationDelegate* InterceptNavigationDelegate::Get(
     WebContents* web_contents) {
-  return reinterpret_cast<InterceptNavigationDelegate*>(
+  return static_cast<InterceptNavigationDelegate*>(
       web_contents->GetUserData(kInterceptNavigationDelegateUserDataKey));
 }
 

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
@@ -193,7 +193,7 @@ class ContentViewCoreImpl::ContentViewUserData
 ContentViewCoreImpl* ContentViewCoreImpl::FromWebContents(
     content::WebContents* web_contents) {
   ContentViewCoreImpl::ContentViewUserData* data =
-      reinterpret_cast<ContentViewCoreImpl::ContentViewUserData*>(
+      static_cast<ContentViewCoreImpl::ContentViewUserData*>(
           web_contents->GetUserData(kContentViewUserDataKey));
   return data ? data->get() : NULL;
 }

diff --git a/content/browser/appcache/appcache_interceptor.cc b/content/browser/appcache/appcache_interceptor.cc
@@ -25,7 +25,7 @@ void AppCacheInterceptor::SetHandler(net::URLRequest* request,
 
 AppCacheRequestHandler* AppCacheInterceptor::GetHandler(
     net::URLRequest* request) {
-  return reinterpret_cast<AppCacheRequestHandler*>(
+  return static_cast<AppCacheRequestHandler*>(
       request->GetUserData(GetInstance()));
 }
 

diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
@@ -103,7 +103,7 @@ void ServiceWorkerRequestHandler::InitializeHandler(
 
 ServiceWorkerRequestHandler* ServiceWorkerRequestHandler::GetHandler(
     net::URLRequest* request) {
-  return reinterpret_cast<ServiceWorkerRequestHandler*>(
+  return static_cast<ServiceWorkerRequestHandler*>(
       request->GetUserData(&kUserDataKey));
 }