diff options
author | lambroslambrou <lambroslambrou@chromium.org> | 2016-03-18 17:59:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-19 01:03:03 +0000 |
commit | 2ec62b362a4638fdabc87de6b54ab3cf05b0bfc5 (patch) | |
tree | 51e0701b86bfd16574d309baa7952aa38982fae3 /remoting/client | |
parent | 033e445721e4295862e6312481b9f59a13cb7c26 (diff) | |
download | chromium_src-2ec62b362a4638fdabc87de6b54ab3cf05b0bfc5.zip chromium_src-2ec62b362a4638fdabc87de6b54ab3cf05b0bfc5.tar.gz chromium_src-2ec62b362a4638fdabc87de6b54ab3cf05b0bfc5.tar.bz2 |
[remoting android] Remove API key and client id/secret.
These are no longer needed, now that we are using device-based
authentication via GoogleAuthUtil from Google Play Services.
Review URL: https://codereview.chromium.org/1818673002
Cr-Commit-Position: refs/heads/master@{#382158}
Diffstat (limited to 'remoting/client')
-rw-r--r-- | remoting/client/jni/chromoting_jni_runtime.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc index 5b319f7..443e0b6 100644 --- a/remoting/client/jni/chromoting_jni_runtime.cc +++ b/remoting/client/jni/chromoting_jni_runtime.cc @@ -13,7 +13,6 @@ #include "base/memory/singleton.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" -#include "google_apis/google_api_keys.h" #include "jni/JniInterface_jni.h" #include "remoting/base/url_request_context_getter.h" #include "remoting/client/jni/jni_touch_event_data.h" @@ -38,38 +37,12 @@ bool RegisterChromotingJniRuntime(JNIEnv* env) { // points for JNI calls from Java into C++. static void LoadNative(JNIEnv* env, const JavaParamRef<jclass>& clazz) { - // The google_apis functions check the command-line arguments to make sure no - // runtime API keys have been specified by the environment. Unfortunately, we - // neither launch Chromium nor have a command line, so we need to prevent - // them from DCHECKing out when they go looking. base::CommandLine::Init(0, nullptr); // Create the singleton now so that the Chromoting threads will be set up. remoting::ChromotingJniRuntime::GetInstance(); } -static ScopedJavaLocalRef<jstring> GetApiKey( - JNIEnv* env, - const JavaParamRef<jclass>& clazz) { - return ConvertUTF8ToJavaString(env, google_apis::GetAPIKey().c_str()); -} - -static ScopedJavaLocalRef<jstring> GetClientId( - JNIEnv* env, - const JavaParamRef<jclass>& clazz) { - return ConvertUTF8ToJavaString( - env, - google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING).c_str()); -} - -static ScopedJavaLocalRef<jstring> GetClientSecret( - JNIEnv* env, - const JavaParamRef<jclass>& clazz) { - return ConvertUTF8ToJavaString( - env, - google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING).c_str()); -} - static void Connect(JNIEnv* env, const JavaParamRef<jclass>& clazz, const JavaParamRef<jstring>& username, |