| Index: net/base/ssl_config_service.h | 
| =================================================================== | 
| --- net/base/ssl_config_service.h	(revision 3954) | 
| +++ net/base/ssl_config_service.h	(working copy) | 
| @@ -34,7 +34,7 @@ | 
| class SSLConfigService { | 
| public: | 
| SSLConfigService(); | 
| -  explicit SSLConfigService(TimeTicks now);  // Used for testing. | 
| +  explicit SSLConfigService(base::TimeTicks now);  // Used for testing. | 
| ~SSLConfigService() { } | 
|  | 
| // Get the current SSL configuration settings.  Can be called on any | 
| @@ -50,18 +50,18 @@ | 
| // we don't need the absolutely current configuration settings.  This | 
| // method is not thread-safe, so it must be called on the same thread. | 
| void GetSSLConfig(SSLConfig* config) { | 
| -    GetSSLConfigAt(config, TimeTicks::Now()); | 
| +    GetSSLConfigAt(config, base::TimeTicks::Now()); | 
| } | 
|  | 
| // Used for testing. | 
| -  void GetSSLConfigAt(SSLConfig* config, TimeTicks now); | 
| +  void GetSSLConfigAt(SSLConfig* config, base::TimeTicks now); | 
|  | 
| private: | 
| -  void UpdateConfig(TimeTicks now); | 
| +  void UpdateConfig(base::TimeTicks now); | 
|  | 
| // We store the IE SSL config and the time that we fetched it. | 
| SSLConfig config_info_; | 
| -  TimeTicks config_time_; | 
| +  base::TimeTicks config_time_; | 
|  | 
| DISALLOW_EVIL_CONSTRUCTORS(SSLConfigService); | 
| }; | 
|  |