| 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 c1fbc3abc25887c4ca93d24de2245da1ce38f62b..b29dcc18b5974c64fac3c8945085635f3ecd2b3d 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
|
| @@ -28,7 +28,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;
|
| @@ -41,7 +41,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(gfx::VectorIconId icon) { icon_ = icon; }
|
| @@ -56,7 +57,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_;
|
| gfx::VectorIconId icon_;
|
| base::string16 ev_cert_name_;
|
| bool should_display_url_;
|
|
|