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

Side by Side Diff: components/variations/android/variations_seed_bridge.cc

Issue 1549993003: Switch to standard integer types in components/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/variations/android/variations_seed_bridge.h" 5 #include "components/variations/android/variations_seed_bridge.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <stdint.h>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/android/context_utils.h" 11 #include "base/android/context_utils.h"
11 #include "base/android/jni_android.h" 12 #include "base/android/jni_android.h"
12 #include "base/android/jni_array.h" 13 #include "base/android/jni_array.h"
13 #include "base/android/jni_string.h" 14 #include "base/android/jni_string.h"
14 #include "base/android/jni_weak_ref.h" 15 #include "base/android/jni_weak_ref.h"
15 #include "jni/VariationsSeedBridge_jni.h" 16 #include "jni/VariationsSeedBridge_jni.h"
16 17
17 using base::android::AttachCurrentThread; 18 using base::android::AttachCurrentThread;
18 using base::android::ConvertJavaStringToUTF8; 19 using base::android::ConvertJavaStringToUTF8;
19 using base::android::ConvertUTF8ToJavaString; 20 using base::android::ConvertUTF8ToJavaString;
20 using base::android::GetApplicationContext; 21 using base::android::GetApplicationContext;
21 using base::android::ScopedJavaLocalRef; 22 using base::android::ScopedJavaLocalRef;
22 23
23 namespace { 24 namespace {
24 25
25 std::string JavaByteArrayToString(JNIEnv* env, jbyteArray byte_array) { 26 std::string JavaByteArrayToString(JNIEnv* env, jbyteArray byte_array) {
26 if (!byte_array) 27 if (!byte_array)
27 return std::string(); 28 return std::string();
28 std::vector<uint8> array_data; 29 std::vector<uint8_t> array_data;
29 base::android::JavaByteArrayToByteVector(env, byte_array, &array_data); 30 base::android::JavaByteArrayToByteVector(env, byte_array, &array_data);
30 return std::string(array_data.begin(), array_data.end()); 31 return std::string(array_data.begin(), array_data.end());
31 } 32 }
32 33
33 ScopedJavaLocalRef<jbyteArray> StringToJavaByteArray( 34 ScopedJavaLocalRef<jbyteArray> StringToJavaByteArray(
34 JNIEnv* env, 35 JNIEnv* env,
35 const std::string& str_data) { 36 const std::string& str_data) {
36 std::vector<uint8> array_data(str_data.begin(), str_data.end()); 37 std::vector<uint8_t> array_data(str_data.begin(), str_data.end());
37 return base::android::ToJavaByteArray(env, array_data); 38 return base::android::ToJavaByteArray(env, array_data);
38 } 39 }
39 40
40 } // namespace 41 } // namespace
41 42
42 namespace variations { 43 namespace variations {
43 namespace android { 44 namespace android {
44 45
45 bool RegisterVariationsSeedBridge(JNIEnv* env) { 46 bool RegisterVariationsSeedBridge(JNIEnv* env) {
46 return RegisterNativesImpl(env); 47 return RegisterNativesImpl(env);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 Java_VariationsSeedBridge_setVariationsFirstRunSeed( 95 Java_VariationsSeedBridge_setVariationsFirstRunSeed(
95 env, GetApplicationContext(), StringToJavaByteArray(env, seed_data).obj(), 96 env, GetApplicationContext(), StringToJavaByteArray(env, seed_data).obj(),
96 ConvertUTF8ToJavaString(env, seed_signature).obj(), 97 ConvertUTF8ToJavaString(env, seed_signature).obj(),
97 ConvertUTF8ToJavaString(env, seed_country).obj(), 98 ConvertUTF8ToJavaString(env, seed_country).obj(),
98 ConvertUTF8ToJavaString(env, response_date).obj(), 99 ConvertUTF8ToJavaString(env, response_date).obj(),
99 static_cast<jboolean>(is_gzip_compressed)); 100 static_cast<jboolean>(is_gzip_compressed));
100 } 101 }
101 102
102 } // namespace android 103 } // namespace android
103 } // namespace variations 104 } // namespace variations
OLDNEW
« no previous file with comments | « components/variations/android/component_jni_registrar.cc ('k') | components/variations/caching_permuted_entropy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698