Move Icons out of Extension class

chrome/common/localized_error.cc

Index: chrome/common/localized_error.cc
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index 832ad9993b550f34bf1807c6ff9853dd1e3863ff..0a3decc8e671261877daeed2fa83456d32623a5a 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
@@ -10,6 +10,7 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_set.h"
@@ -709,11 +710,15 @@ void LocalizedError::GetAppErrorStrings(
                                        failed_url.c_str()));
 
   error_strings->SetString("title", app->name());
-  error_strings->SetString("icon",
-      app->GetIconURL(extension_misc::EXTENSION_ICON_GIGANTOR,
-                      ExtensionIconSet::MATCH_SMALLER).spec());
+  error_strings->SetString(
+     "icon",
+      extensions::IconsInfo::GetIconURL(
+          app,
+          extension_misc::EXTENSION_ICON_GIGANTOR,
+          ExtensionIconSet::MATCH_SMALLER).spec());
   error_strings->SetString("name", app->name());
-  error_strings->SetString("msg",
+  error_strings->SetString(
+      "msg",
       l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING));
 
 #if defined(OS_CHROMEOS)