chrome/browser/ui/cocoa/one_click_signin_bubble_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/one_click_signin_bubble_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/one_click_signin_bubble_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/one_click_signin_dialog_controller.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/one_click_signin_bubble_controller_unittest.mm

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

index 86ac82668d38fb222d421d9f848ce55c48d2d57c..a60e3a2d188e9308d0dbe15eb834eeed027058d4 100644

--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm

@@ -8,12 +8,12 @@

#include "base/bind.h"

#include "base/compiler_specific.h"

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

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

#include "base/memory/weak_ptr.h"

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

#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

-#include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"

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

+#include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#import "testing/gtest_mac.h"

@@ -54,7 +54,7 @@ class OneClickSigninBubbleControllerTest : public CocoaProfileTest {

protected:

base::WeakPtrFactory<OneClickSigninBubbleControllerTest> weak_ptr_factory_;

BrowserWindow::StartSyncCallback start_sync_callback_;

- scoped_nsobject<OneClickSigninBubbleController> controller_;

+ base::scoped_nsobject<OneClickSigninBubbleController> controller_;

private:

DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleControllerTest);