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

Side by Side Diff: ios/chrome/browser/ui/browser_view_controller_unittest.mm

Issue 2812623002: Revert of [ios] Move WebStateList to ios/chrome/browser/web_state_list. (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import <Foundation/Foundation.h> 5 #import <Foundation/Foundation.h>
6 #import <PassKit/PassKit.h> 6 #import <PassKit/PassKit.h>
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 26 matching lines...) Expand all
37 #import "ios/chrome/browser/ui/browser_view_controller_testing.h" 37 #import "ios/chrome/browser/ui/browser_view_controller_testing.h"
38 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h" 38 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
39 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" 39 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
40 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" 40 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h"
41 #import "ios/chrome/browser/ui/page_not_available_controller.h" 41 #import "ios/chrome/browser/ui/page_not_available_controller.h"
42 #include "ios/chrome/browser/ui/toolbar/test_toolbar_model_ios.h" 42 #include "ios/chrome/browser/ui/toolbar/test_toolbar_model_ios.h"
43 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h" 43 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
44 #include "ios/chrome/browser/ui/ui_util.h" 44 #include "ios/chrome/browser/ui/ui_util.h"
45 #import "ios/chrome/browser/web/error_page_content.h" 45 #import "ios/chrome/browser/web/error_page_content.h"
46 #import "ios/chrome/browser/web/passkit_dialog_provider.h" 46 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
47 #include "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
48 #include "ios/chrome/browser/web_state_list/web_state_list.h"
49 #include "ios/chrome/grit/ios_strings.h" 47 #include "ios/chrome/grit/ios_strings.h"
50 #include "ios/chrome/test/block_cleanup_test.h" 48 #include "ios/chrome/test/block_cleanup_test.h"
51 #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h" 49 #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
52 #include "ios/chrome/test/testing_application_context.h" 50 #include "ios/chrome/test/testing_application_context.h"
51 #include "ios/shared/chrome/browser/tabs/fake_web_state_list_delegate.h"
52 #include "ios/shared/chrome/browser/tabs/web_state_list.h"
53 #import "ios/testing/ocmock_complex_type_helper.h" 53 #import "ios/testing/ocmock_complex_type_helper.h"
54 #include "ios/web/public/referrer.h" 54 #include "ios/web/public/referrer.h"
55 #include "ios/web/public/test/test_web_thread_bundle.h" 55 #include "ios/web/public/test/test_web_thread_bundle.h"
56 #import "ios/web/public/web_state/ui/crw_native_content_provider.h" 56 #import "ios/web/public/web_state/ui/crw_native_content_provider.h"
57 #import "ios/web/web_state/ui/crw_web_controller.h" 57 #import "ios/web/web_state/ui/crw_web_controller.h"
58 #import "ios/web/web_state/web_state_impl.h" 58 #import "ios/web/web_state/web_state_impl.h"
59 #import "net/base/mac/url_conversions.h" 59 #import "net/base/mac/url_conversions.h"
60 #include "net/url_request/url_request_test_util.h" 60 #include "net/url_request/url_request_test_util.h"
61 #include "testing/gmock/include/gmock/gmock.h" 61 #include "testing/gmock/include/gmock/gmock.h"
62 #include "testing/gtest/include/gtest/gtest.h" 62 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 static_cast<OCMockObject*>(shareController_.get()); 565 static_cast<OCMockObject*>(shareController_.get());
566 [[shareControllerMock expect] cancelShareAnimated:NO]; 566 [[shareControllerMock expect] cancelShareAnimated:NO];
567 EXPECT_CALL(*this, OnCompletionCalled()); 567 EXPECT_CALL(*this, OnCompletionCalled());
568 [bvc_ clearPresentedStateWithCompletion:^{ 568 [bvc_ clearPresentedStateWithCompletion:^{
569 this->OnCompletionCalled(); 569 this->OnCompletionCalled();
570 }]; 570 }];
571 EXPECT_OCMOCK_VERIFY(shareControllerMock); 571 EXPECT_OCMOCK_VERIFY(shareControllerMock);
572 } 572 }
573 573
574 } // namespace 574 } // namespace
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/chrome/browser/ui/contextual_search/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698