Cleanup resource_bundle_unittest

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>
@@ skipping 236 matching lines @@
   FilePath GetLocaleFilePath(const std::string& app_locale,
                              bool test_file_exists);
 
   // Returns the maximum scale factor currently loaded.
   // Returns SCALE_FACTOR_100P if no resource is loaded.
   ScaleFactor max_scale_factor() const {
     return max_scale_factor_;
   }
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForResourcePack);
-  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(ResourceBundleTest, DelegateGetPathForLocalePack);
+  FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetImageNamed);
+  FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetNativeImageNamed);
+
+  friend class ResourceBundleImageTest;
+  friend class ResourceBundleTest;
 
   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 87 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_