Fix ResourceBundleImageSource

ui/base/resource/resource_bundle.h

 // 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.
 
 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace base {
 class Lock;
 class RefCountedStaticMemory;
 }
 
 namespace ui {
 
 class ResourceHandle;
 
 // ResourceBundle is a central facility to load images and other resources,
 // such as theme graphics. Every resource is loaded only once.
-class UI_EXPORT ResourceBundle {
+class UI_EXPORT ResourceBundle : public base::SupportsWeakPtr<ResourceBundle> {
  public:
   // An enumeration of the various font styles used throughout Chrome.
   // The following holds true for the font sizes:
   // Small <= Base <= Bold <= Medium <= MediumBold <= Large.
   enum FontStyle {
     SmallFont,
     BaseFont,
     BoldFont,
     MediumFont,
     // NOTE: depending upon the locale, this may *not* result in a bold font.
@@ skipping 189 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForLocalePack);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetImageNamed);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetNativeImageNamed);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateLoadDataResourceBytes);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetRawDataResource);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetLocalizedString);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetFont);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetRawDataResource);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LocaleDataPakExists);
+  FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetImageNamed);
+  FRIEND_TEST_ALL_PREFIXES(ResourceBundle, ImageLifetime);

[tony, 2012/09/18 18:43:42]

Nit: In a separate change, it would probably be worth switching this to 'friend
class ResourceBundleTest;' rather than continuing to enumerate all the test
names.

 
   class ResourceBundleImageSource;
   friend class ResourceBundleImageSource;
 
   // Ctor/dtor are private, since we're a singleton.
   explicit ResourceBundle(Delegate* delegate);
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
@@ skipping 72 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_