diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-06 22:47:47 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:06 +0100 |
| commit | 0c081bc606af7dc01818d2bc96062412ce93a460 (patch) | |
| tree | 78c845186a6ade9b3c11761f003ec04b6d2672e3 /net | |
| parent | 8474bd350e233cca45dcbfe5f8e4f542675c4c66 (diff) | |
| download | external_chromium-0c081bc606af7dc01818d2bc96062412ce93a460.zip external_chromium-0c081bc606af7dc01818d2bc96062412ce93a460.tar.gz external_chromium-0c081bc606af7dc01818d2bc96062412ce93a460.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fix in transport_security_state.cc
ifdef out command line switch
Change-Id: I64509a51060b4b95202087080688cadebbf183ac
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/transport_security_state.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index af4e866..399f3cb 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.cc @@ -496,9 +496,13 @@ bool TransportSecurityState::IsPreloadedSTS( out->include_subdomains = false; std::map<std::string, DomainState> hosts; - std::string cmd_line_hsts = - CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + std::string cmd_line_hsts +#ifdef ANDROID + ; +#else + = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kHstsHosts); +#endif if (!cmd_line_hsts.empty()) { bool dirty; Deserialise(cmd_line_hsts, &dirty, &hosts); |