summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 21:15:50 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 21:15:50 +0000
commit4c58eac90cfc27e21a276c820f3280a96e69d903 (patch)
treeb0bb880c58486833a3d17f1cccfb21278279261a
parent513b7e3ba99e22c82408f460f370c7cc62b3d346 (diff)
downloadchromium_src-4c58eac90cfc27e21a276c820f3280a96e69d903.zip
chromium_src-4c58eac90cfc27e21a276c820f3280a96e69d903.tar.gz
chromium_src-4c58eac90cfc27e21a276c820f3280a96e69d903.tar.bz2
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
-rw-r--r--net/android/network_change_notifier_android.h2
-rw-r--r--net/android/network_change_notifier_delegate_android.h2
-rw-r--r--net/base/x509_util.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h
index fe5c8da..35c9b46 100644
--- a/net/android/network_change_notifier_android.h
+++ b/net/android/network_change_notifier_android.h
@@ -39,7 +39,7 @@ class NetworkChangeNotifierFactoryAndroid;
// and be called by any thread.
//
// For more details, see the implementation file.
-class NetworkChangeNotifierAndroid
+class NET_EXPORT_PRIVATE NetworkChangeNotifierAndroid
: public NetworkChangeNotifier,
public NetworkChangeNotifierDelegateAndroid::Observer {
public:
diff --git a/net/android/network_change_notifier_delegate_android.h b/net/android/network_change_notifier_delegate_android.h
index f1d8127..9f5caa4 100644
--- a/net/android/network_change_notifier_delegate_android.h
+++ b/net/android/network_change_notifier_delegate_android.h
@@ -19,7 +19,7 @@ namespace net {
// JNI thread).
// All the methods exposed below must be called exclusively on the JNI thread
// unless otherwise stated (e.g. AddObserver()/RemoveObserver()).
-class NetworkChangeNotifierDelegateAndroid {
+class NET_EXPORT_PRIVATE NetworkChangeNotifierDelegateAndroid {
public:
enum ConnectivityState {
OFFLINE,
diff --git a/net/base/x509_util.h b/net/base/x509_util.h
index 623e2b3..734eebd 100644
--- a/net/base/x509_util.h
+++ b/net/base/x509_util.h
@@ -26,8 +26,8 @@ namespace x509_util {
// limited the range to 1950-9999
// (https://bugzilla.mozilla.org/show_bug.cgi?id=786531). This function will
// return whether it is supported by the currently used crypto library.
-bool IsSupportedValidityRange(base::Time not_valid_before,
- base::Time not_valid_after);
+NET_EXPORT_PRIVATE bool IsSupportedValidityRange(base::Time not_valid_before,
+ base::Time not_valid_after);
// Creates a server bound certificate containing the public key in |key|.
// Domain, serial number and validity period are given as
@@ -36,7 +36,7 @@ bool IsSupportedValidityRange(base::Time not_valid_before,
//
// See Internet Draft draft-balfanz-tls-obc-00 for more details:
// http://tools.ietf.org/html/draft-balfanz-tls-obc-00
-bool NET_EXPORT_PRIVATE CreateDomainBoundCertEC(
+NET_EXPORT_PRIVATE bool CreateDomainBoundCertEC(
crypto::ECPrivateKey* key,
const std::string& domain,
uint32 serial_number,