chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm ('k') | chrome/browser/notifications/notification_ui_manager_mac.h » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

index c88493b8d900755fef294613abf8ea201746a0ec..7e71717039abecef34060ba44bf035995f1c484f 100644

--- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

+++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm

@@ -9,7 +9,7 @@

#include "base/files/scoped_temp_dir.h"

#include "base/mac/cocoa_protocols.h"

#include "base/mac/foundation_util.h"

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#include "base/message_loop.h"

#include "base/run_loop.h"

#include "base/strings/sys_string_conversions.h"

@@ -47,7 +47,7 @@ const char kTestFileContents[] = "test";

@interface MockMTPICCameraDevice : ICCameraDevice {

@private

- scoped_nsobject<NSMutableArray> allMediaFiles_;

+ base::scoped_nsobject<NSMutableArray> allMediaFiles_;

}

- (void)addMediaFile:(ICCameraFile*)file;

@@ -121,8 +121,8 @@ const char kTestFileContents[] = "test";

@interface MockMTPICCameraFile : ICCameraFile {

@private

- scoped_nsobject<NSString> name_;

- scoped_nsobject<NSDate> date_;

+ base::scoped_nsobject<NSString> name_;

+ base::scoped_nsobject<NSDate> date_;

}

- (id)init:(NSString*)name;

@@ -546,7 +546,7 @@ TEST_F(MTPDeviceDelegateImplMacTest, TestDownload) {

info.last_accessed = t1;

info.creation_time = t1;

std::string kTestFileName("filename");

- scoped_nsobject<MockMTPICCameraFile> picture1(

+ base::scoped_nsobject<MockMTPICCameraFile> picture1(

[[MockMTPICCameraFile alloc]

init:base::SysUTF8ToNSString(kTestFileName)]);

[camera_ addMediaFile:picture1];