chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_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/ui/cocoa/tab_contents/sad_tab_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

« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

index 5c2e92545e61e100f1000c9147c2eda0956179bd..0067968de481d9622e26012458f5c2efb6ea0b21 100644

--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

@@ -3,7 +3,7 @@

// found in the LICENSE file.

#include "base/debug/debugger.h"

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

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

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

#import "chrome/browser/ui/cocoa/hyperlink_text_view.h"

#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"

@@ -75,7 +75,7 @@ class SadTabControllerTest : public ChromeRenderViewHostTestHarness {

bool SadTabControllerTest::link_clicked_;

TEST_F(SadTabControllerTest, WithTabContents) {

- scoped_nsobject<SadTabController> controller(CreateController());

+ base::scoped_nsobject<SadTabController> controller(CreateController());

EXPECT_TRUE(controller);

HyperlinkTextView* help = GetHelpTextView(controller);

EXPECT_TRUE(help);

@@ -83,14 +83,14 @@ TEST_F(SadTabControllerTest, WithTabContents) {

TEST_F(SadTabControllerTest, WithoutTabContents) {

DeleteContents();

- scoped_nsobject<SadTabController> controller(CreateController());

+ base::scoped_nsobject<SadTabController> controller(CreateController());

EXPECT_TRUE(controller);

HyperlinkTextView* help = GetHelpTextView(controller);

EXPECT_FALSE(help);

}

TEST_F(SadTabControllerTest, ClickOnLink) {

- scoped_nsobject<SadTabController> controller(CreateController());

+ base::scoped_nsobject<SadTabController> controller(CreateController());

HyperlinkTextView* help = GetHelpTextView(controller);

EXPECT_TRUE(help);

EXPECT_FALSE(link_clicked_);