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

Unified Diff: chrome/browser/ui/cocoa/history_menu_cocoa_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/history_menu_cocoa_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
index ddcfa9c23dfa49f3698948ade5b837e13301d5d3..3870efbb1643f03dbb0d4f6166b7dab975665d3e 100644
--- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
@@ -71,7 +71,7 @@ class HistoryMenuCocoaControllerTest : public CocoaProfileTest {
};
TEST_F(HistoryMenuCocoaControllerTest, OpenURLForItem) {
- scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"History"]);
+ base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"History"]);
CreateItems(menu.get());
std::map<NSMenuItem*, HistoryMenuBridge::HistoryItem*>& items =

Powered by Google App Engine
This is Rietveld 408576698