summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 19:10:48 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 19:10:48 +0000
commita80e99306bfcd23cc84ccb5cf39a94b3b9b8b268 (patch)
tree596508e48cfbc5ba960b5a9d2b3870db91342dd3
parent9cec718466e9dec2fc36d7cc3951aee737df5f64 (diff)
downloadchromium_src-a80e99306bfcd23cc84ccb5cf39a94b3b9b8b268.zip
chromium_src-a80e99306bfcd23cc84ccb5cf39a94b3b9b8b268.tar.gz
chromium_src-a80e99306bfcd23cc84ccb5cf39a94b3b9b8b268.tar.bz2
Fix up the unittest to now expect the image within the bundle.
TEST=chromium mac goes green BUG=none Review URL: http://codereview.chromium.org/194104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26137 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/throbber_view_unittest.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/throbber_view_unittest.mm b/chrome/browser/cocoa/throbber_view_unittest.mm
index 2cf2db4..caee8b1 100644
--- a/chrome/browser/cocoa/throbber_view_unittest.mm
+++ b/chrome/browser/cocoa/throbber_view_unittest.mm
@@ -4,11 +4,13 @@
#import <Cocoa/Cocoa.h>
+#include "app/resource_bundle.h"
#include "base/scoped_nsobject.h"
#import "chrome/browser/cocoa/throbber_view.h"
#import "chrome/browser/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#include "grit/app_resources.h"
namespace {
@@ -16,10 +18,8 @@ class ThrobberViewTest : public PlatformTest {
public:
ThrobberViewTest() {
NSRect frame = NSMakeRect(10, 10, 16, 16);
- NSBundle* bundle = mac_util::MainAppBundle();
- NSImage* image = [[[NSImage alloc] initByReferencingFile:
- [bundle pathForResource:@"throbber" ofType:@"png"]]
- autorelease];
+ NSImage* image =
+ ResourceBundle::GetSharedInstance().GetNSImageNamed(IDR_THROBBER);
view_.reset([[ThrobberView filmstripThrobberViewWithFrame:frame
image:image] retain]);
[cocoa_helper_.contentView() addSubview:view_.get()];