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

Side by Side Diff: webrtc/modules/audio_device/android/build_info.cc

Issue 1722083002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/audio_device/android/build_info.h" 11 #include "webrtc/modules/audio_device/android/build_info.h"
12 12
13 #include "webrtc/modules/utility/include/helpers_android.h" 13 #include "webrtc/modules/utility/include/helpers_android.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 BuildInfo::BuildInfo() 17 BuildInfo::BuildInfo()
18 : j_environment_(JVM::GetInstance()->environment()), 18 : j_environment_(rtc::ScopedToUnique(JVM::GetInstance()->environment())),
19 j_build_info_(JVM::GetInstance()->GetClass( 19 j_build_info_(JVM::GetInstance()->GetClass(
20 "org/webrtc/voiceengine/BuildInfo")) { 20 "org/webrtc/voiceengine/BuildInfo")) {
21 } 21 }
22 22
23 std::string BuildInfo::GetStringFromJava(const char* name) { 23 std::string BuildInfo::GetStringFromJava(const char* name) {
24 jmethodID id = j_build_info_.GetStaticMethodId(name, "()Ljava/lang/String;"); 24 jmethodID id = j_build_info_.GetStaticMethodId(name, "()Ljava/lang/String;");
25 jstring j_string = static_cast<jstring>( 25 jstring j_string = static_cast<jstring>(
26 j_build_info_.CallStaticObjectMethod(id)); 26 j_build_info_.CallStaticObjectMethod(id));
27 return j_environment_->JavaToStdString(j_string); 27 return j_environment_->JavaToStdString(j_string);
28 } 28 }
(...skipping 20 matching lines...) Expand all
49 49
50 std::string BuildInfo::GetBuildRelease() { 50 std::string BuildInfo::GetBuildRelease() {
51 return GetStringFromJava("getBuildRelease"); 51 return GetStringFromJava("getBuildRelease");
52 } 52 }
53 53
54 std::string BuildInfo::GetSdkVersion() { 54 std::string BuildInfo::GetSdkVersion() {
55 return GetStringFromJava("getSdkVersion"); 55 return GetStringFromJava("getSdkVersion");
56 } 56 }
57 57
58 } // namespace webrtc 58 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/build_info.h ('k') | webrtc/modules/audio_device/android/opensles_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698