Upstreaming RegisterProcessUtils()

chrome/browser/android/process_utils.cc

Index: chrome/browser/android/process_utils.cc
diff --git a/chrome/browser/android/process_utils.cc b/chrome/browser/android/process_utils.cc
index c0f52802273241fca6752799da785159567790df..886030471a8fe4315deb19f7e3b9ccb27856dc48 100644
--- a/chrome/browser/android/process_utils.cc
+++ b/chrome/browser/android/process_utils.cc
@@ -8,12 +8,44 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/render_messages.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "jni/ProcessUtils_jni.h"
+#include "net/http/http_network_session.h"
+#include "net/http/http_transaction_factory.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
+void CloseIdleConnectionsForProfile(

[Satish, 2012/07/25 09:07:21]

where is this method being used? downstream there is the jni method 'static void
CloseIdleConnections()' in this file which you haven't included in this CL. If
this CL is only about fixing the TODO looks like you can remove this method. If
however you want to unfork the whole of process_utils.cc then I'd suggest
pulling in all methods in this file and associated java code in
ProcessUtils.java

[aurimas (slooooooooow), 2012/07/25 15:28:30]

I wanted to include CloseIdleConnections(), but when I do and try to compile I
get "cc1plus: warnings being treated as errors
chrome/browser/android/process_utils.cc:89: error: 'void
CloseIdleConnections(JNIEnv*, _jclass*)' defined but not used". Is there a way
to mark this method so it would ignore the fact that it is not used?

+    scoped_refptr<net::URLRequestContextGetter> context_getter) {
+  DCHECK(context_getter.get());
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
+    content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
+                           base::Bind(&CloseIdleConnectionsForProfile,
+                                      context_getter));
+    return;
+  }
+
+  net::URLRequestContext* context = context_getter->GetURLRequestContext();
+  DCHECK(context->http_transaction_factory());
+  // TODO(satish): Remove this early return after verifying the above doesn't

[Satish, 2012/07/25 09:07:21]

looks like this if condition and the one below can be removed as we haven't seen
the DCHECKs getting hit so far. And if they happen in the field we'll get a
crash report so would be quicker to find/fix

[aurimas (slooooooooow), 2012/07/25 15:28:30]

Do I keep the DCHECKs and just remove if statements?

+  // fail.
+  if (!context->http_transaction_factory())
+    return;
+  net::HttpNetworkSession* session =
+      context->http_transaction_factory()->GetSession();
+  DCHECK(session);
+  // TODO(satish): Remove this check after verifying the above doesn't fail.
+  if (session)
+    session->CloseIdleConnections();
+}
+
 // Only accessed from the JNI thread by ToggleWebKitSharedTimers() which is
 // implemented below.
 base::LazyInstance<std::vector<int /* process id */> > g_suspended_processes =
@@ -54,7 +86,6 @@ static void ToggleWebKitSharedTimers(JNIEnv* env,
   }
 }
 
-// TODO(pliard): http://crbug.com/137674
 bool RegisterProcessUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }