Move Icons out of Extension class

chrome/browser/extensions/convert_web_app_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
 namespace extensions {
 
@@ skipping 51 matching lines @@
   EXPECT_EQ("the description is", installed_extension_->description());
   EXPECT_EQ(extension_misc::LAUNCH_PANEL,
             installed_extension_->launch_container());
 
   ASSERT_EQ(2u, installed_extension_->GetActivePermissions()->apis().size());
   EXPECT_TRUE(installed_extension_->HasAPIPermission(
       APIPermission::kGeolocation));
   EXPECT_TRUE(installed_extension_->HasAPIPermission(
       APIPermission::kNotification));
 
-  ASSERT_EQ(3u, installed_extension_->icons().map().size());
-  EXPECT_EQ("icons/16.png", installed_extension_->icons().Get(
-      16, ExtensionIconSet::MATCH_EXACTLY));
-  EXPECT_EQ("icons/48.png", installed_extension_->icons().Get(
-      48, ExtensionIconSet::MATCH_EXACTLY));
-  EXPECT_EQ("icons/128.png", installed_extension_->icons().Get(
-      128, ExtensionIconSet::MATCH_EXACTLY));
+  const ExtensionIconSet& icons = IconsInfo::GetIcons(installed_extension_);
+  ASSERT_EQ(3u, icons.map().size());
+  EXPECT_EQ("icons/16.png", icons.Get(16, ExtensionIconSet::MATCH_EXACTLY));
+  EXPECT_EQ("icons/48.png", icons.Get(48, ExtensionIconSet::MATCH_EXACTLY));
+  EXPECT_EQ("icons/128.png", icons.Get(128, ExtensionIconSet::MATCH_EXACTLY));
 }
 
 }  // namespace extensions