[Cronet] Enable persistence mode for Sdch

components/cronet/android/test/sdch_test_util.cc

Index: components/cronet/android/test/sdch_test_util.cc
diff --git a/components/cronet/android/test/sdch_test_util.cc b/components/cronet/android/test/sdch_test_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..441b0343adf0ec9b801d4e55a9f71de58edc7ac8
--- /dev/null
+++ b/components/cronet/android/test/sdch_test_util.cc
@@ -0,0 +1,140 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "sdch_test_util.h"
+
+#include <string>
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/bind.h"
+#include "base/macros.h"
+#include "components/cronet/android/cronet_url_request_context_adapter.h"
+#include "components/cronet/android/url_request_context_adapter.h"
+#include "jni/SdchObserver_jni.h"
+#include "net/base/sdch_manager.h"
+#include "net/base/sdch_observer.h"
+#include "net/url_request/url_request_context.h"
+#include "url/gurl.h"
+
+namespace cronet {
+
+namespace {
+
+class TestSdchObserver : public net::SdchObserver {
+ public:
+  TestSdchObserver(
+      net::SdchManager* manager,
+      const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref)
+      : manager_(manager) {
+    jsdch_observer_ref_.Reset(jsdch_observer_ref);
+  }
+
+  // SdchObserver implementation
+  void OnDictionaryAdded(const GURL& dictionary_url,
+                         const std::string& server_hash) override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    Java_SdchObserver_onDictionaryAdded(env, jsdch_observer_ref_.obj(),
+                                        base::android::ConvertUTF8ToJavaString(
+                                            env, dictionary_url.spec()).obj());
+    manager_->RemoveObserver(this);
+    delete this;
+  }
+
+  void OnDictionaryRemoved(const std::string& server_hash) override {}
+
+  void OnDictionaryUsed(const std::string& server_hash) override {}
+
+  void OnGetDictionary(const GURL& request_url,
+                       const GURL& dictionary_url) override {}
+
+  void OnClearDictionaries() override {}
+
+ private:
+  net::SdchManager* manager_;
+  base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestSdchObserver);
+};
+
+void AddSdchObserverHelper(
+    const GURL& target_url,
+    const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref,
+    net::URLRequestContext* url_request_context) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  // If dictionaries for |target_url| are already added, skip adding the
+  // observer.
+  if (url_request_context->sdch_manager()->GetDictionarySet(target_url)) {

[mmenke, 2015/05/27 20:56:05]

Seems weird to only check target URL here, and not in OnDictionaryAdded. 
Suggest checking it there, too, and then removing the check from the subclass,
for a more consistent interface.

[xunjieli, 2015/05/27 21:39:42]

You are right. That will make the interface more consistent. Done. Thanks!

+    Java_SdchObserver_onDictionarySetAlreadyPresent(env,
+                                                    jsdch_observer_ref.obj());
+    return;
+  }
+
+  url_request_context->sdch_manager()->AddObserver(new TestSdchObserver(
+      url_request_context->sdch_manager(), jsdch_observer_ref));
+  Java_SdchObserver_onAddSdchObserverCompleted(env, jsdch_observer_ref.obj());
+}
+
+void AddSdchObserverOnNetworkThread(
+    const GURL& target_url,
+    const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref,
+    CronetURLRequestContextAdapter* context_adapter) {
+  AddSdchObserverHelper(target_url, jsdch_observer_ref,
+                        context_adapter->GetURLRequestContext());
+}
+
+// TODO(xunjieli): Delete this once legacy API is removed.
+void AddSdchObserverOnNetworkThreadLegacyAPI(
+    const GURL& target_url,
+    const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref,
+    URLRequestContextAdapter* context_adapter) {
+  AddSdchObserverHelper(target_url, jsdch_observer_ref,
+                        context_adapter->GetURLRequestContext());
+}
+
+}  // namespace
+
+void AddSdchObserver(JNIEnv* env,
+                     jobject jsdch_observer,
+                     jstring jtarget_url,
+                     jlong jadapter) {
+  base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref;
+  // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to
+  // use it across threads. |AddSdchObserverHelper| will acquire a new
+  // JNIEnv before calling into Java.
+  jsdch_observer_ref.Reset(env, jsdch_observer);
+
+  GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url));
+  CronetURLRequestContextAdapter* context_adapter =
+      reinterpret_cast<CronetURLRequestContextAdapter*>(jadapter);
+  context_adapter->PostTaskToNetworkThread(
+      FROM_HERE,
+      base::Bind(&AddSdchObserverOnNetworkThread, target_url,
+                 jsdch_observer_ref, base::Unretained(context_adapter)));
+}
+
+void AddSdchObserverLegacyAPI(JNIEnv* env,
+                              jobject jsdch_observer,
+                              jstring jtarget_url,
+                              jlong jadapter) {
+  base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref;
+  // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to
+  // use it across threads. |AddSdchObserverHelper| will acquire a new
+  // JNIEnv before calling into Java.
+  jsdch_observer_ref.Reset(env, jsdch_observer);
+  GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url));
+  URLRequestContextAdapter* context_adapter =
+      reinterpret_cast<URLRequestContextAdapter*>(jadapter);
+  context_adapter->PostTaskToNetworkThread(
+      FROM_HERE,
+      base::Bind(&AddSdchObserverOnNetworkThreadLegacyAPI, target_url,
+                 jsdch_observer_ref, base::Unretained(context_adapter)));
+}
+
+bool RegisterSdchTestUtil(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+}  // namespace cronet