Vectorize CrOS window control icons.

chrome/browser/ui/toolbar/test_toolbar_model.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 
 #include "grit/components_scaled_resources.h"
 #include "ui/gfx/vector_icons_public.h"
 
 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() {}
 
 base::string16 TestToolbarModel::GetText() const {
   return text_;
 }
 
 base::string16 TestToolbarModel::GetFormattedURL(size_t* prefix_end) const {
   return text_;
@@ skipping 11 matching lines @@
     bool ignore_editing) const {
   return perform_search_term_replacement_;
 }
 
 SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
     bool ignore_editing) const {
   return security_level_;
 }
 
 int TestToolbarModel::GetIcon() const {
+  // This placeholder implementation should be removed when MD is default.
+  return IDR_LOCATION_BAR_HTTP;
+}
+
+gfx::VectorIconId TestToolbarModel::GetVectorIcon() const {
   return icon_;
 }
 
-gfx::VectorIconId TestToolbarModel::GetVectorIcon() const {
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
-}
-
 base::string16 TestToolbarModel::GetEVCertName() const {
   return (security_level_ == SecurityStateModel::EV_SECURE) ? ev_cert_name_
                                                             : base::string16();
 }
 
 bool TestToolbarModel::ShouldDisplayURL() const {
   return should_display_url_;
 }