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

Unified Diff: chrome/browser/ui/cocoa/about_ipc_controller_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/ui/cocoa/about_ipc_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm b/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm
index 3f4eee7d9d792c00eb6d2b8d255d80700a96113d..e4c7bc1668600caea2aacad4e4a3379fba4d2d59 100644
--- a/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/message_loop.h"
#import "chrome/browser/ui/cocoa/about_ipc_controller.h"
#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
@@ -46,15 +46,15 @@ TEST_F(AboutIPCControllerTest, TestFilter) {
"NPObjectHell" };
for (size_t i = 0; i < arraysize(names); i++) {
data.message_name = names[i];
- scoped_nsobject<CocoaLogData> cdata([[CocoaLogData alloc]
- initWithLogData:data]);
+ base::scoped_nsobject<CocoaLogData> cdata(
+ [[CocoaLogData alloc] initWithLogData:data]);
EXPECT_FALSE([controller filterOut:cdata.get()]);
}
// Flip a checkbox, see it filtered, flip back, all is fine.
data.message_name = "ViewMsgFoo";
- scoped_nsobject<CocoaLogData> cdata([[CocoaLogData alloc]
- initWithLogData:data]);
+ base::scoped_nsobject<CocoaLogData> cdata(
+ [[CocoaLogData alloc] initWithLogData:data]);
[controller setDisplayViewMessages:NO];
EXPECT_TRUE([controller filterOut:cdata.get()]);
[controller setDisplayViewMessages:YES];

Powered by Google App Engine
This is Rietveld 408576698