Added GetNetworkOperatorID util func in net/base/net_util and a non-trivial implementation for Andr…

net/base/net_util.cc

 // Copyright (c) 2012 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 "net/base/net_util.h"
 
 #include <errno.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 53 matching lines @@
 #include "net/http/http_content_disposition.h"
 #include "third_party/icu/source/common/unicode/uidna.h"
 #include "third_party/icu/source/common/unicode/uniset.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "third_party/icu/source/common/unicode/uset.h"
 #include "third_party/icu/source/i18n/unicode/datefmt.h"
 #include "third_party/icu/source/i18n/unicode/regex.h"
 #include "third_party/icu/source/i18n/unicode/ulocdata.h"
 
 #if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "jni/Telephony_jni.h"
 #include "net/android/network_library.h"
 #endif
 #if defined(OS_WIN)
 #include "net/base/winsock_init.h"
 #endif
 
 using base::Time;
 
 namespace net {
 
@@ skipping 1748 matching lines @@
     NOTREACHED();
   }
   return a1.size() * CHAR_BIT;
 }
 
 unsigned MaskPrefixLength(const IPAddressNumber& mask) {
   IPAddressNumber all_ones(mask.size(), 0xFF);
   return CommonPrefixLength(mask, all_ones);
 }
 
+std::string GetNetworkOperatorID() {
+#if defined(OS_ANDROID)
+  return base::android::ConvertJavaStringToUTF8(

[mef, 2014/04/16 20:57:57]

I meant move this Android-specific implementation into
net/android/network_library.*

[bolian, 2014/04/16 23:40:52]

Done. Yes, I think that is better.

+      Java_Telephony_getNetworkOperator(
+          base::android::AttachCurrentThread(),
+          base::android::GetApplicationContext()));
+#else
+  return "";
+#endif
+}
+
+#if defined(OS_ANDROID)
+bool NetworkInfo_GetNetworkOperatorID(JNIEnv* env) {

[mef, 2014/04/16 20:57:57]

This could go to android-specific module.

[bolian, 2014/04/16 23:40:52]

Done.

+    return RegisterNativesImpl(env);
+}
+#endif
+
 }  // namespace net