Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Unified Diff: chrome/browser/web_applications/web_app_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
Index: chrome/browser/web_applications/web_app_mac_unittest.mm
diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm
index 6112245153402eb7a225ea36870fcd5d4658f522..09bc976d383248acd509aba7efa1033824f8d8f2 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -6,13 +6,13 @@
#import <Cocoa/Cocoa.h>
-#include <sys/xattr.h>
#include <errno.h>
+#include <sys/xattr.h>
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/mac/app_mode_common.h"
@@ -242,8 +242,8 @@ TEST(WebAppShortcutCreatorTest, UpdateIcon) {
base::FilePath icon_path =
dst_path.Append("Contents").Append("Resources").Append("app.icns");
- scoped_nsobject<NSImage> image([[NSImage alloc] initWithContentsOfFile:
- base::mac::FilePathToNSString(icon_path)]);
+ base::scoped_nsobject<NSImage> image([[NSImage alloc]
+ initWithContentsOfFile:base::mac::FilePathToNSString(icon_path)]);
EXPECT_TRUE(image);
EXPECT_EQ(product_logo.Width(), [image size].width);
EXPECT_EQ(product_logo.Height(), [image size].height);

Powered by Google App Engine
This is Rietveld 408576698