| Index: chrome/browser/ui/toolbar/test_toolbar_model.cc
|
| diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc
|
| index b345a1b9e82b398c61263593eef34ecaf5d94e1a..68887fa8addb6e3d212636828eab57c52c224d60 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
|
| @@ -9,7 +9,7 @@
|
| TestToolbarModel::TestToolbarModel()
|
| : ToolbarModel(),
|
| perform_search_term_replacement_(false),
|
| - security_level_(ConnectionSecurityHelper::NONE),
|
| + security_level_(connection_security::NONE),
|
| icon_(IDR_LOCATION_BAR_HTTP),
|
| should_display_url_(true) {
|
| }
|
| @@ -37,7 +37,7 @@ bool TestToolbarModel::WouldPerformSearchTermReplacement(
|
| return perform_search_term_replacement_;
|
| }
|
|
|
| -ConnectionSecurityHelper::SecurityLevel TestToolbarModel::GetSecurityLevel(
|
| +connection_security::SecurityLevel TestToolbarModel::GetSecurityLevel(
|
| bool ignore_editing) const {
|
| return security_level_;
|
| }
|
| @@ -47,14 +47,13 @@ int TestToolbarModel::GetIcon() const {
|
| }
|
|
|
| int TestToolbarModel::GetIconForSecurityLevel(
|
| - ConnectionSecurityHelper::SecurityLevel level) const {
|
| + connection_security::SecurityLevel level) const {
|
| return icon_;
|
| }
|
|
|
| base::string16 TestToolbarModel::GetEVCertName() const {
|
| - return (security_level_ == ConnectionSecurityHelper::EV_SECURE)
|
| - ? ev_cert_name_
|
| - : base::string16();
|
| + return (security_level_ == connection_security::EV_SECURE) ? ev_cert_name_
|
| + : base::string16();
|
| }
|
|
|
| bool TestToolbarModel::ShouldDisplayURL() const {
|
|
|