chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm - Issue 284893003: Move bookmarks/core/... to bookmarks/...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	5 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

6 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	6 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"	7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"

8 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"	8 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"

9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"	9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"

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

11 #include "chrome/test/base/testing_profile.h"	11 #include "chrome/test/base/testing_profile.h"

12 #include "components/bookmarks/core/browser/bookmark_model.h"	12 #include "components/bookmarks/browser/bookmark_model.h"

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

14 #include "testing/platform_test.h"	14 #include "testing/platform_test.h"

15 #import "third_party/ocmock/OCMock/OCMock.h"	15 #import "third_party/ocmock/OCMock/OCMock.h"

16 #include "third_party/ocmock/gtest_support.h"	16 #include "third_party/ocmock/gtest_support.h"

17	17

18 @interface OCMockObject(PreventRetainCycle)	18 @interface OCMockObject(PreventRetainCycle)

19 - (void)clearRecordersAndExpectations;	19 - (void)clearRecordersAndExpectations;

20 @end	20 @end

21	21

22 @implementation OCMockObject(PreventRetainCycle)	22 @implementation OCMockObject(PreventRetainCycle)

(...skipping 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 base::scoped_nsobject<BookmarkFolderTarget> target(	117 base::scoped_nsobject<BookmarkFolderTarget> target(

118 [[BookmarkFolderTarget alloc] initWithController:controller	118 [[BookmarkFolderTarget alloc] initWithController:controller

119 profile:profile()]);	119 profile:profile()]);

120	120

121 [target openBookmarkFolderFromButton:sender];	121 [target openBookmarkFolderFromButton:sender];

122 EXPECT_OCMOCK_VERIFY(controller);	122 EXPECT_OCMOCK_VERIFY(controller);

123	123

124 // Break retain cycles.	124 // Break retain cycles.

125 [controller clearRecordersAndExpectations];	125 [controller clearRecordersAndExpectations];

126 }	126 }

OLD	NEW