[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/extensions/extension_action_icon_factory_unittest.cc

 // Copyright (c) 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/extensions/extension_action_icon_factory.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 193 matching lines @@
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default.
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension.get());
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());
 
   gfx::ImageSkia favicon = GetFavicon();

[lazyboy, 2016/03/04 03:13:53]

Remove?

[Devlin, 2016/03/04 03:36:41]

Done.

 
   ExtensionActionIconFactory icon_factory(
       profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      favicon.GetRepresentation(1.0f),
+      browser_action->GetDefaultIconImage().ToImageSkia()->GetRepresentation(
+          1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 }
 
 // If the icon has been set using |SetIcon|, the factory should return that
 // icon.
 TEST_P(ExtensionActionIconFactoryTest, AfterSetIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
@@ skipping 13 matching lines @@
 
   ExtensionActionIconFactory icon_factory(
       profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       set_icon.ToImageSkia()->GetRepresentation(1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
-  // It should still return favicon for another tabs.
+  // It should still return the default icon for another tab.
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      GetFavicon().GetRepresentation(1.0f),
+      browser_action->GetDefaultIconImage().ToImageSkia()->GetRepresentation(
+          1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 }
 
 // If there is a default icon, and the icon has not been set using |SetIcon|,
 // the factory should return the default icon.
 TEST_P(ExtensionActionIconFactoryTest, DefaultIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
@@ skipping 39 matching lines @@
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       default_icon.ToImageSkia()->GetRepresentation(1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
 }
 
 }  // namespace
 }  // namespace extensions