| 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/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 using bookmarks::BookmarkModel; | 18 using bookmarks::BookmarkModel; |
| 19 using bookmarks::BookmarkNode; |
| 19 | 20 |
| 20 @interface OCMockObject(PreventRetainCycle) | 21 @interface OCMockObject(PreventRetainCycle) |
| 21 - (void)clearRecordersAndExpectations; | 22 - (void)clearRecordersAndExpectations; |
| 22 @end | 23 @end |
| 23 | 24 |
| 24 @implementation OCMockObject(PreventRetainCycle) | 25 @implementation OCMockObject(PreventRetainCycle) |
| 25 | 26 |
| 26 // We need a mechanism to clear the invocation handlers to break a | 27 // We need a mechanism to clear the invocation handlers to break a |
| 27 // retain cycle (see below; search for "retain cycle"). | 28 // retain cycle (see below; search for "retain cycle"). |
| 28 - (void)clearRecordersAndExpectations { | 29 - (void)clearRecordersAndExpectations { |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 base::scoped_nsobject<BookmarkFolderTarget> target( | 120 base::scoped_nsobject<BookmarkFolderTarget> target( |
| 120 [[BookmarkFolderTarget alloc] initWithController:controller | 121 [[BookmarkFolderTarget alloc] initWithController:controller |
| 121 profile:profile()]); | 122 profile:profile()]); |
| 122 | 123 |
| 123 [target openBookmarkFolderFromButton:sender]; | 124 [target openBookmarkFolderFromButton:sender]; |
| 124 EXPECT_OCMOCK_VERIFY(controller); | 125 EXPECT_OCMOCK_VERIFY(controller); |
| 125 | 126 |
| 126 // Break retain cycles. | 127 // Break retain cycles. |
| 127 [controller clearRecordersAndExpectations]; | 128 [controller clearRecordersAndExpectations]; |
| 128 } | 129 } |
| OLD | NEW |