More pre-MD odds and ends.

chrome/common/extensions/api/extension_action/page_action_manifest_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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
@@ skipping 63 matching lines @@
   const std::string name("MyExtensionActionName");
   std::string img1("image1.png");
 
   action = LoadAction("page_action.json");
   ASSERT_TRUE(action);
   ASSERT_EQ(id, action->id);
 
   // No title, so fall back to name.
   ASSERT_EQ(name, action->default_title);
   ASSERT_EQ(img1,
-            action->default_icon.Get(extension_misc::EXTENSION_ICON_ACTION,
-                                     ExtensionIconSet::MATCH_EXACTLY));
+            action->default_icon.Get(19, ExtensionIconSet::MATCH_EXACTLY));
 
   // Same test with explicitly set type.
   action = LoadAction("page_action_type.json");
   ASSERT_TRUE(action);
 
   // Try an action without id key.
   action = LoadAction("page_action_no_id.json");
   ASSERT_TRUE(action);
 
   // Then try without the name key. It's optional, so no error.
@@ skipping 68 matching lines @@
   action = LoadAction("page_action_empty_popup.json");
 
   ASSERT_TRUE(action);
   EXPECT_TRUE(action->default_popup_url.is_empty());
   ASSERT_STREQ(
       "",
       action->default_popup_url.spec().c_str());
 }
 
 }  // namespace extensions