| Index: chrome/browser/ui/toolbar/test_toolbar_model.h
|
| diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.h b/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| index d604a80213ac4878826de88030dd6c8f873447a0..2d676268e57da806ba6a3be74c04e4f9d5d1f17c 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| @@ -21,11 +21,11 @@ class TestToolbarModel : public ToolbarModel {
|
| base::string16 GetCorpusNameForMobile() const override;
|
| GURL GetURL() const override;
|
| bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
|
| - ConnectionSecurityHelper::SecurityLevel GetSecurityLevel(
|
| + connection_security::SecurityLevel GetSecurityLevel(
|
| bool ignore_editing) const override;
|
| int GetIcon() const override;
|
| int GetIconForSecurityLevel(
|
| - ConnectionSecurityHelper::SecurityLevel level) const override;
|
| + connection_security::SecurityLevel level) const override;
|
| base::string16 GetEVCertName() const override;
|
| bool ShouldDisplayURL() const override;
|
|
|
| @@ -35,8 +35,7 @@ class TestToolbarModel : public ToolbarModel {
|
| bool perform_search_term_replacement) {
|
| perform_search_term_replacement_ = perform_search_term_replacement;
|
| }
|
| - void set_security_level(
|
| - ConnectionSecurityHelper::SecurityLevel security_level) {
|
| + void set_security_level(connection_security::SecurityLevel security_level) {
|
| security_level_ = security_level;
|
| }
|
| void set_icon(int icon) { icon_ = icon; }
|
| @@ -51,7 +50,7 @@ class TestToolbarModel : public ToolbarModel {
|
| base::string16 text_;
|
| GURL url_;
|
| bool perform_search_term_replacement_;
|
| - ConnectionSecurityHelper::SecurityLevel security_level_;
|
| + connection_security::SecurityLevel security_level_;
|
| int icon_;
|
| base::string16 ev_cert_name_;
|
| bool should_display_url_;
|
|
|