diff options
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/android_http_util.cc | 2 | ||||
| -rw-r--r-- | net/android/traffic_stats_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/android/android_http_util.cc b/net/android/android_http_util.cc index 92a18b361..5549c2d7d 100644 --- a/net/android/android_http_util.cc +++ b/net/android/android_http_util.cc @@ -7,9 +7,9 @@ #include "net/net_jni_headers/HttpUtil_jni.h" #include "url/gurl.h" +using base::android::ConvertJavaStringToUTF8; using base::android::JavaParamRef; using base::android::ScopedJavaLocalRef; -using base::android::ConvertJavaStringToUTF16; namespace net { diff --git a/net/android/traffic_stats_unittest.cc b/net/android/traffic_stats_unittest.cc index 1e707c31b..88679c28f 100644 --- a/net/android/traffic_stats_unittest.cc +++ b/net/android/traffic_stats_unittest.cc @@ -42,7 +42,7 @@ TEST(TrafficStatsAndroidTest, BasicsTest) { context->CreateRequest(embedded_test_server.GetURL("/echo.html"), DEFAULT_PRIORITY, &test_delegate)); request->Start(); - base::RunLoop().Run(); + test_delegate.RunUntilComplete(); // Bytes should increase because of the network traffic. int64_t tx_bytes_after_request = -1; @@ -78,7 +78,7 @@ TEST(TrafficStatsAndroidTest, UIDBasicsTest) { context->CreateRequest(embedded_test_server.GetURL("/echo.html"), DEFAULT_PRIORITY, &test_delegate)); request->Start(); - base::RunLoop().Run(); + test_delegate.RunUntilComplete(); // Bytes should increase because of the network traffic. int64_t tx_bytes_after_request = -1; |