diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/android | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/android')
| -rw-r--r-- | chromium/net/android/keystore_unittest.cc | 5 | ||||
| -rw-r--r-- | chromium/net/android/network_change_notifier_delegate_android.cc | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chromium/net/android/keystore_unittest.cc b/chromium/net/android/keystore_unittest.cc index 98944e29bd0..58e3da796a5 100644 --- a/chromium/net/android/keystore_unittest.cc +++ b/chromium/net/android/keystore_unittest.cc @@ -117,8 +117,7 @@ EVP_PKEY* ImportPrivateKeyFile(const char* filename) { // Load file in memory. base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath file_path = certs_dir.AppendASCII(filename); - ScopedStdioHandle handle( - file_util::OpenFile(file_path, "rb")); + ScopedStdioHandle handle(base::OpenFile(file_path, "rb")); if (!handle.get()) { LOG(ERROR) << "Could not open private key file: " << filename; return NULL; @@ -167,7 +166,7 @@ EVP_PKEY* ImportPublicKeyFile(const char* filename) { // Load file as PEM data. base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath file_path = certs_dir.AppendASCII(filename); - ScopedStdioHandle handle(file_util::OpenFile(file_path, "rb")); + ScopedStdioHandle handle(base::OpenFile(file_path, "rb")); if (!handle.get()) { LOG(ERROR) << "Could not open public key file: " << filename; return NULL; diff --git a/chromium/net/android/network_change_notifier_delegate_android.cc b/chromium/net/android/network_change_notifier_delegate_android.cc index 0031260b73e..207f01b6c86 100644 --- a/chromium/net/android/network_change_notifier_delegate_android.cc +++ b/chromium/net/android/network_change_notifier_delegate_android.cc @@ -40,7 +40,8 @@ NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid() Java_NetworkChangeNotifier_init( env, base::android::GetApplicationContext())); Java_NetworkChangeNotifier_addNativeObserver( - env, java_network_change_notifier_.obj(), reinterpret_cast<jint>(this)); + env, java_network_change_notifier_.obj(), + reinterpret_cast<intptr_t>(this)); SetCurrentConnectionType( ConvertConnectionType( Java_NetworkChangeNotifier_getCurrentConnectionType( @@ -52,7 +53,8 @@ NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() { observers_->AssertEmpty(); JNIEnv* env = base::android::AttachCurrentThread(); Java_NetworkChangeNotifier_removeNativeObserver( - env, java_network_change_notifier_.obj(), reinterpret_cast<jint>(this)); + env, java_network_change_notifier_.obj(), + reinterpret_cast<intptr_t>(this)); } NetworkChangeNotifier::ConnectionType |