Commit 4c58eac9 authored by thakis@chromium.org's avatar thakis@chromium.org

Let net_unittests build with the components build on android

BUG=158821

Review URL: https://codereview.chromium.org/11418265

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170539 0039d316-1c4b-4281-b951-d872f2087c98
parent 513b7e3b
...@@ -39,7 +39,7 @@ class NetworkChangeNotifierFactoryAndroid; ...@@ -39,7 +39,7 @@ class NetworkChangeNotifierFactoryAndroid;
// and be called by any thread. // and be called by any thread.
// //
// For more details, see the implementation file. // For more details, see the implementation file.
class NetworkChangeNotifierAndroid class NET_EXPORT_PRIVATE NetworkChangeNotifierAndroid
: public NetworkChangeNotifier, : public NetworkChangeNotifier,
public NetworkChangeNotifierDelegateAndroid::Observer { public NetworkChangeNotifierDelegateAndroid::Observer {
public: public:
......
...@@ -19,7 +19,7 @@ namespace net { ...@@ -19,7 +19,7 @@ namespace net {
// JNI thread). // JNI thread).
// All the methods exposed below must be called exclusively on the JNI thread // All the methods exposed below must be called exclusively on the JNI thread
// unless otherwise stated (e.g. AddObserver()/RemoveObserver()). // unless otherwise stated (e.g. AddObserver()/RemoveObserver()).
class NetworkChangeNotifierDelegateAndroid { class NET_EXPORT_PRIVATE NetworkChangeNotifierDelegateAndroid {
public: public:
enum ConnectivityState { enum ConnectivityState {
OFFLINE, OFFLINE,
......
...@@ -26,8 +26,8 @@ namespace x509_util { ...@@ -26,8 +26,8 @@ namespace x509_util {
// limited the range to 1950-9999 // limited the range to 1950-9999
// (https://bugzilla.mozilla.org/show_bug.cgi?id=786531). This function will // (https://bugzilla.mozilla.org/show_bug.cgi?id=786531). This function will
// return whether it is supported by the currently used crypto library. // return whether it is supported by the currently used crypto library.
bool IsSupportedValidityRange(base::Time not_valid_before, NET_EXPORT_PRIVATE bool IsSupportedValidityRange(base::Time not_valid_before,
base::Time not_valid_after); base::Time not_valid_after);
// Creates a server bound certificate containing the public key in |key|. // Creates a server bound certificate containing the public key in |key|.
// Domain, serial number and validity period are given as // Domain, serial number and validity period are given as
...@@ -36,7 +36,7 @@ bool IsSupportedValidityRange(base::Time not_valid_before, ...@@ -36,7 +36,7 @@ bool IsSupportedValidityRange(base::Time not_valid_before,
// //
// See Internet Draft draft-balfanz-tls-obc-00 for more details: // See Internet Draft draft-balfanz-tls-obc-00 for more details:
// http://tools.ietf.org/html/draft-balfanz-tls-obc-00 // http://tools.ietf.org/html/draft-balfanz-tls-obc-00
bool NET_EXPORT_PRIVATE CreateDomainBoundCertEC( NET_EXPORT_PRIVATE bool CreateDomainBoundCertEC(
crypto::ECPrivateKey* key, crypto::ECPrivateKey* key,
const std::string& domain, const std::string& domain,
uint32 serial_number, uint32 serial_number,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment