| 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 08b3f15ae66be16312bdbfe8085b0f4d481ee9a3..2dfdbf40d0bac2e1f231e9948f4dcd91c14f7256 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| @@ -21,7 +21,7 @@ class TestToolbarModel : public ChromeToolbarModel {
|
| base::string16 GetCorpusNameForMobile() const override;
|
| GURL GetURL() const override;
|
| bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
|
| - SecurityStateModel::SecurityLevel GetSecurityLevel(
|
| + security_state::SecurityStateModel::SecurityLevel GetSecurityLevel(
|
| bool ignore_editing) const override;
|
| int GetIcon() const override;
|
| gfx::VectorIconId GetVectorIcon() const override;
|
| @@ -34,7 +34,8 @@ class TestToolbarModel : public ChromeToolbarModel {
|
| bool perform_search_term_replacement) {
|
| perform_search_term_replacement_ = perform_search_term_replacement;
|
| }
|
| - void set_security_level(SecurityStateModel::SecurityLevel security_level) {
|
| + void set_security_level(
|
| + security_state::SecurityStateModel::SecurityLevel security_level) {
|
| security_level_ = security_level;
|
| }
|
| void set_icon(int icon) { icon_ = icon; }
|
| @@ -49,7 +50,7 @@ class TestToolbarModel : public ChromeToolbarModel {
|
| base::string16 text_;
|
| GURL url_;
|
| bool perform_search_term_replacement_;
|
| - SecurityStateModel::SecurityLevel security_level_;
|
| + security_state::SecurityStateModel::SecurityLevel security_level_;
|
| int icon_;
|
| base::string16 ev_cert_name_;
|
| bool should_display_url_;
|
|
|