Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: base/android/content_uri_utils.cc

Issue 1828193002: DCHECK that jstring to C++ string conversions don't pass in null. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: braces Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/content_uri_utils.h" 5 #include "base/android/content_uri_utils.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "jni/ContentUriUtils_jni.h" 10 #include "jni/ContentUriUtils_jni.h"
(...skipping 25 matching lines...) Expand all
36 return File(fd); 36 return File(fd);
37 } 37 }
38 38
39 std::string GetContentUriMimeType(const FilePath& content_uri) { 39 std::string GetContentUriMimeType(const FilePath& content_uri) {
40 JNIEnv* env = base::android::AttachCurrentThread(); 40 JNIEnv* env = base::android::AttachCurrentThread();
41 ScopedJavaLocalRef<jstring> j_uri = 41 ScopedJavaLocalRef<jstring> j_uri =
42 ConvertUTF8ToJavaString(env, content_uri.value()); 42 ConvertUTF8ToJavaString(env, content_uri.value());
43 ScopedJavaLocalRef<jstring> j_mime = 43 ScopedJavaLocalRef<jstring> j_mime =
44 Java_ContentUriUtils_getMimeType( 44 Java_ContentUriUtils_getMimeType(
45 env, base::android::GetApplicationContext(), j_uri.obj()); 45 env, base::android::GetApplicationContext(), j_uri.obj());
46 if (j_mime.is_null())
47 return std::string();
48
46 return base::android::ConvertJavaStringToUTF8(env, j_mime.obj()); 49 return base::android::ConvertJavaStringToUTF8(env, j_mime.obj());
47 } 50 }
48 51
49 } // namespace base 52 } // namespace base
OLDNEW
« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | base/android/jni_string.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698