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 c00d3968b4ce76bf45024e572772b4b2b22b6747..729a5bfbae9d95669fb00a1f412998c1cd77e419 100644 |
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc |
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc |
@@ -11,7 +11,7 @@ TestToolbarModel::TestToolbarModel() |
: ChromeToolbarModel(), |
perform_search_term_replacement_(false), |
security_level_(SecurityStateModel::NONE), |
- icon_(IDR_LOCATION_BAR_HTTP), |
+ icon_(gfx::VectorIconId::VECTOR_ICON_NONE), |
should_display_url_(true) {} |
TestToolbarModel::~TestToolbarModel() {} |
@@ -43,11 +43,12 @@ SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel( |
} |
int TestToolbarModel::GetIcon() const { |
- return icon_; |
+ // This placeholder implementation should be removed when MD is default. |
+ return IDR_LOCATION_BAR_HTTP; |
} |
gfx::VectorIconId TestToolbarModel::GetVectorIcon() const { |
- return gfx::VectorIconId::VECTOR_ICON_NONE; |
+ return icon_; |
} |
base::string16 TestToolbarModel::GetEVCertName() const { |