diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
| commit | 6e7845aed4759ab35d722ce0551b5a90d21e7640 (patch) | |
| tree | f29a3f007f7ded842d2096446ff7ecaf186cb362 /android_webview | |
| parent | a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5 (diff) | |
| download | chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.zip chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.gz chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.bz2 | |
net: extract net/cert out of net/base
This introduces the following dependency of net/base on things outside:
net/base/openssl_client_key_store.cc:#include "net/cert/x509_certificate.h"
BUG=70818
Review URL: https://codereview.chromium.org/13006020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_contents.cc | 2 | ||||
| -rw-r--r-- | android_webview/native/aw_contents_client_bridge.cc | 2 | ||||
| -rw-r--r-- | android_webview/tools/third_party_files_whitelist.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index f4cc2e2..0284f56 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -38,7 +38,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/ssl_status.h" #include "jni/AwContents_jni.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "ui/gfx/android/java_bitmap.h" struct AwDrawSWFunctionTable; diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc index 2149ae0..0c13ebe 100644 --- a/android_webview/native/aw_contents_client_bridge.cc +++ b/android_webview/native/aw_contents_client_bridge.cc @@ -11,7 +11,7 @@ #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "jni/AwContentsClientBridge_jni.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index 7011a92..5361c3d 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -88,7 +88,7 @@ content/browser/renderer_host/web_input_event_aurax11.cc # Copyright Google Inc, no license. Not used on Android. google_update/google_update_idl.idl # String '(c)' used in certificates organization names -net/base/test_certificate_data.h +net/test/test_certificate_data.h # Copyright The Chromium Authors and Netscape Communications Corporation; BSD # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from # Mozilla, the license for which we already pick up from third_party/npapi/. |