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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

Issue 1871783002: Remove the Data Reduction Proxy TLS experiment code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests 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 "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 JNIEnv* env, 184 JNIEnv* env,
185 const JavaParamRef<jobject>& obj) { 185 const JavaParamRef<jobject>& obj) {
186 data_reduction_proxy::DataReductionProxyEventStore* event_store = 186 data_reduction_proxy::DataReductionProxyEventStore* event_store =
187 Settings()->GetEventStore(); 187 Settings()->GetEventStore();
188 if (!event_store) 188 if (!event_store)
189 return ConvertUTF8ToJavaString(env, std::string()); 189 return ConvertUTF8ToJavaString(env, std::string());
190 190
191 return ConvertUTF8ToJavaString(env, event_store->GetHttpProxyList()); 191 return ConvertUTF8ToJavaString(env, event_store->GetHttpProxyList());
192 } 192 }
193 193
194 ScopedJavaLocalRef<jstring>
195 DataReductionProxySettingsAndroid::GetHttpsProxyList(
tbansal1 2016/04/12 05:16:31 Remove function from .h file.
megjablon 2016/04/12 21:02:37 Done.
196 JNIEnv* env,
197 const JavaParamRef<jobject>& obj) {
198 data_reduction_proxy::DataReductionProxyEventStore* event_store =
199 Settings()->GetEventStore();
200 if (!event_store)
201 return ConvertUTF8ToJavaString(env, std::string());
202
203 return ConvertUTF8ToJavaString(env, event_store->GetHttpsProxyList());
204 }
205
206 DataReductionProxySettings* DataReductionProxySettingsAndroid::Settings() { 194 DataReductionProxySettings* DataReductionProxySettingsAndroid::Settings() {
207 DataReductionProxySettings* settings = 195 DataReductionProxySettings* settings =
208 DataReductionProxyChromeSettingsFactory::GetForBrowserContext( 196 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
209 ProfileManager::GetActiveUserProfile()); 197 ProfileManager::GetActiveUserProfile());
210 DCHECK(settings); 198 DCHECK(settings);
211 return settings; 199 return settings;
212 } 200 }
213 201
214 ScopedJavaLocalRef<jstring> 202 ScopedJavaLocalRef<jstring>
215 DataReductionProxySettingsAndroid::GetLastBypassEvent( 203 DataReductionProxySettingsAndroid::GetLastBypassEvent(
216 JNIEnv* env, 204 JNIEnv* env,
217 const JavaParamRef<jobject>& obj) { 205 const JavaParamRef<jobject>& obj) {
218 data_reduction_proxy::DataReductionProxyEventStore* event_store = 206 data_reduction_proxy::DataReductionProxyEventStore* event_store =
219 Settings()->GetEventStore(); 207 Settings()->GetEventStore();
220 if (!event_store) 208 if (!event_store)
221 return ConvertUTF8ToJavaString(env, std::string()); 209 return ConvertUTF8ToJavaString(env, std::string());
222 210
223 return ConvertUTF8ToJavaString(env, event_store->SanitizedLastBypassEvent()); 211 return ConvertUTF8ToJavaString(env, event_store->SanitizedLastBypassEvent());
224 } 212 }
225 213
226 // Used by generated jni code. 214 // Used by generated jni code.
227 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 215 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
228 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid()); 216 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid());
229 } 217 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698