[Cronet] Enable persistence mode for Sdch

components/cronet/android/test/sdch_test_util.cc

+// 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 "base/android/jni_android.h"
+#include "base/android/jni_string.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/SdchTestUtil_jni.h"
+#include "net/base/sdch_manager.h"
+#include "net/base/sdch_observer.h"
+#include "url/gurl.h"
+
+namespace cronet {
+
+namespace {
+
+net::SdchObserver* g_sdch_observer = nullptr;
+
+class TestSdchObserver : public net::SdchObserver {
+ public:
+  TestSdchObserver() {}
+
+  // SdchObserver implementation
+  void OnDictionaryAdded(const GURL& dictionary_url,
+                         const std::string& server_hash) override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    Java_SdchTestUtil_onDictionaryAdded(
+        env, base::android::ConvertUTF8ToJavaString(env, dictionary_url.spec())
+                 .Release());

[mmenke, 2015/05/20 18:33:42]

Maybe just remove itself as an observer and delete itself here, and then get rid
of the remove half of AddRemoveSdchObserver?  Could optionally take a
dictionary_url to wait for as input, if you're concerned about other
dictionaries.

You can then also get rid of g_sdch_observer, as long as we never have a test
where we expect a dictionary not to be added in some interval.

[xunjieli, 2015/05/20 21:06:12]

Done. That's neat! thanks

+  }
+
+  void OnDictionaryRemoved(const std::string& server_hash) override{};

[mmenke, 2015/05/20 18:33:41]

should include <string>

[xunjieli, 2015/05/20 21:06:12]

Done.

+
+  void OnDictionaryUsed(const std::string& server_hash) override{};
+
+  void OnGetDictionary(const GURL& request_url,
+                       const GURL& dictionary_url) override{};
+
+  void OnClearDictionaries() override{};

[mmenke, 2015/05/20 18:33:41]

Space after override, on all of these.

[xunjieli, 2015/05/20 21:06:12]

Done.

+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestSdchObserver);
+};
+
+void AddRemoveSdchObserverHelper(net::URLRequestContext* url_request_context,
+                                 bool add) {
+  // Add a SdchObserver for testing.
+  if (add) {
+    DCHECK(!g_sdch_observer);
+    g_sdch_observer = new TestSdchObserver();
+    url_request_context->sdch_manager()->AddObserver(g_sdch_observer);

[mmenke, 2015/05/20 18:33:41]

delete g_sdch_observer?
g_sdch_observer = nullptr;

+  } else {
+    DCHECK(g_sdch_observer);
+    url_request_context->sdch_manager()->RemoveObserver(g_sdch_observer);

[mmenke, 2015/05/20 18:33:42]

delete g_sdch_observer?

+    g_sdch_observer = nullptr;
+  }
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_SdchTestUtil_onAddRemoveSdchObserverCompleted(env);
+}
+
+void AddRemoveSdchObserverOnNetworkThread(
+    CronetURLRequestContextAdapter* context_adapter,
+    bool add) {
+  AddRemoveSdchObserverHelper(context_adapter->GetURLRequestContext(), add);
+}
+
+// TODO(xunjieli): Delete this once legacy API is removed.
+void AddRemoveSdchObserverOnNetworkThreadLegacyAPI(
+    URLRequestContextAdapter* context_adapter,
+    bool add) {
+  AddRemoveSdchObserverHelper(context_adapter->GetURLRequestContext(), add);
+}
+
+}  // namespace
+
+void AddRemoveSdchObserver(JNIEnv* env,

[mmenke, 2015/05/20 18:33:42]

+1 to splitting this up into multiple methods.

+                           jclass jcaller,
+                           jlong jadapter,
+                           jboolean jlegacy_api,
+                           jboolean add) {
+  if (jlegacy_api == JNI_TRUE) {
+    URLRequestContextAdapter* context_adapter =
+        reinterpret_cast<URLRequestContextAdapter*>(jadapter);
+    context_adapter->PostTaskToNetworkThread(
+        FROM_HERE, base::Bind(&AddRemoveSdchObserverOnNetworkThreadLegacyAPI,
+                              base::Unretained(context_adapter),
+                              add ? JNI_TRUE : JNI_FALSE));
+    return;
+  }
+  CronetURLRequestContextAdapter* context_adapter =
+      reinterpret_cast<CronetURLRequestContextAdapter*>(jadapter);
+  context_adapter->PostTaskToNetworkThread(
+      FROM_HERE, base::Bind(&AddRemoveSdchObserverOnNetworkThread,
+                            base::Unretained(context_adapter),
+                            add ? JNI_TRUE : JNI_FALSE));
+}
+
+bool RegisterSdchTestUtil(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+}  // namespace cronet