Skip to content

GitLab

T
tangled
Commit d37fbc0e authored by Eugene But's avatar Eugene But Committed by Chromium LUCI CQ
Browse files
Options

[ios] Use Fake term for ios/web/test/fake names 

Bug: 688063
Change-Id: Ib172e591591024bcd7303a6064a8132eec792dce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592389
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837218}
parent 45c11e80
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 78 deletions
ios/chrome/browser/web_state_list/active_web_state_observation_forwarder_unittest.mm
View file @ d37fbc0e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "ios/chrome/browser/web_state_list/web_state_list.h" #include "ios/chrome/browser/web_state_list/web_state_list.h"
#include "ios/chrome/browser/web_state_list/web_state_list_delegate.h" #include "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
#include "ios/chrome/browser/web_state_list/web_state_opener.h" #include "ios/chrome/browser/web_state_list/web_state_opener.h"
#include "ios/web/public/test/fakes/test_web_state.h" #include "ios/web/public/test/fakes/fake_web_state.h"
#include "ios/web/public/web_state_observer.h" #include "ios/web/public/web_state_observer.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h" #include "testing/gtest_mac.h"
...@@ -52,10 +52,9 @@ class ActiveWebStateObservationForwarderTest : public PlatformTest, ...@@ -52,10 +52,9 @@ class ActiveWebStateObservationForwarderTest : public PlatformTest,
&web_state_list_, &observer_); &web_state_list_, &observer_);
} }
web::TestWebState* AddWebStateToList(bool activate) { web::FakeWebState* AddWebStateToList(bool activate) {
std::unique_ptr<web::TestWebState> web_state( auto web_state = std::make_unique<web::FakeWebState>();
std::make_unique<web::TestWebState>()); web::FakeWebState* web_state_ptr = web_state.get();
web::TestWebState* web_state_ptr = web_state.get();
web_state_list_.InsertWebState(0, std::move(web_state), web_state_list_.InsertWebState(0, std::move(web_state),
activate ? WebStateList::INSERT_ACTIVATE activate ? WebStateList::INSERT_ACTIVATE
: WebStateList::INSERT_NO_FLAGS, : WebStateList::INSERT_NO_FLAGS,
...@@ -78,8 +77,8 @@ class ActiveWebStateObservationForwarderTest : public PlatformTest, ...@@ -78,8 +77,8 @@ class ActiveWebStateObservationForwarderTest : public PlatformTest,
TEST_F(ActiveWebStateObservationForwarderTest, TestInsertActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestInsertActiveWebState) {
// Insert two webstates into the list and mark the second one active. Send // Insert two webstates into the list and mark the second one active. Send
// observer notifications for both and verify the result. // observer notifications for both and verify the result.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
web_state_a->OnRenderProcessGone(); web_state_a->OnRenderProcessGone();
...@@ -93,8 +92,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestInsertActiveWebState) { ...@@ -93,8 +92,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestInsertActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TestInsertNonActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestInsertNonActiveWebState) {
// Insert two webstates into the list, but do not mark the second one active. // Insert two webstates into the list, but do not mark the second one active.
// Send observer notifications for both and verify the result. // Send observer notifications for both and verify the result.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(false); web::FakeWebState* web_state_b = AddWebStateToList(false);
ASSERT_EQ(web_state_a, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_a, web_state_list_.GetActiveWebState());
web_state_a->OnRenderProcessGone(); web_state_a->OnRenderProcessGone();
...@@ -107,9 +106,9 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestInsertNonActiveWebState) { ...@@ -107,9 +106,9 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestInsertNonActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TestDetachActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestDetachActiveWebState) {
// Insert three webstates into the list. // Insert three webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
web::TestWebState* web_state_c = AddWebStateToList(true); web::FakeWebState* web_state_c = AddWebStateToList(true);
ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState());
// Remove the active web state and send observer notifications. // Remove the active web state and send observer notifications.
...@@ -131,9 +130,9 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestDetachActiveWebState) { ...@@ -131,9 +130,9 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestDetachActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TestDetachNonActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestDetachNonActiveWebState) {
// Insert three webstates into the list. // Insert three webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
web::TestWebState* web_state_c = AddWebStateToList(true); web::FakeWebState* web_state_c = AddWebStateToList(true);
ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState());
// Remove a non-active web state and send observer notifications. // Remove a non-active web state and send observer notifications.
...@@ -154,14 +153,13 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestDetachNonActiveWebState) { ...@@ -154,14 +153,13 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestDetachNonActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TestReplaceActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestReplaceActiveWebState) {
// Insert two webstates into the list and mark the second one active. // Insert two webstates into the list and mark the second one active.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Replace the active web state. Send notifications and verify the result. // Replace the active web state. Send notifications and verify the result.
std::unique_ptr<web::TestWebState> replacement_web_state( auto replacement_web_state = std::make_unique<web::FakeWebState>();
std::make_unique<web::TestWebState>()); web::FakeWebState* web_state_c = replacement_web_state.get();
web::TestWebState* web_state_c = replacement_web_state.get();
std::unique_ptr<web::WebState> detached_web_state = std::unique_ptr<web::WebState> detached_web_state =
web_state_list_.ReplaceWebStateAt( web_state_list_.ReplaceWebStateAt(
...@@ -180,8 +178,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestReplaceActiveWebState) { ...@@ -180,8 +178,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestReplaceActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TestChangeActiveWebState) { TEST_F(ActiveWebStateObservationForwarderTest, TestChangeActiveWebState) {
// Insert two webstates into the list and mark the second one active. // Insert two webstates into the list and mark the second one active.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Make web state A active and send notifications. // Make web state A active and send notifications.
...@@ -209,8 +207,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestChangeActiveWebState) { ...@@ -209,8 +207,8 @@ TEST_F(ActiveWebStateObservationForwarderTest, TestChangeActiveWebState) {
TEST_F(ActiveWebStateObservationForwarderTest, TEST_F(ActiveWebStateObservationForwarderTest,
TestNonEmptyInitialWebStateList) { TestNonEmptyInitialWebStateList) {
// Insert two webstates into the list. // Insert two webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Recreate the multi observer to simulate creation with an already-populated // Recreate the multi observer to simulate creation with an already-populated
......
ios/chrome/browser/web_state_list/all_web_state_observation_forwarder_unittest.mm
View file @ d37fbc0e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "ios/chrome/browser/web_state_list/web_state_list.h" #include "ios/chrome/browser/web_state_list/web_state_list.h"
#include "ios/chrome/browser/web_state_list/web_state_list_delegate.h" #include "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
#include "ios/chrome/browser/web_state_list/web_state_opener.h" #include "ios/chrome/browser/web_state_list/web_state_opener.h"
#include "ios/web/public/test/fakes/test_web_state.h" #include "ios/web/public/test/fakes/fake_web_state.h"
#include "ios/web/public/web_state_observer.h" #include "ios/web/public/web_state_observer.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h" #include "testing/gtest_mac.h"
...@@ -52,10 +52,9 @@ class AllWebStateObservationForwarderTest : public PlatformTest, ...@@ -52,10 +52,9 @@ class AllWebStateObservationForwarderTest : public PlatformTest,
&web_state_list_, &observer_); &web_state_list_, &observer_);
} }
web::TestWebState* AddWebStateToList(bool activate) { web::FakeWebState* AddWebStateToList(bool activate) {
std::unique_ptr<web::TestWebState> web_state( auto web_state = std::make_unique<web::FakeWebState>();
std::make_unique<web::TestWebState>()); web::FakeWebState* web_state_ptr = web_state.get();
web::TestWebState* web_state_ptr = web_state.get();
web_state_list_.InsertWebState(0, std::move(web_state), web_state_list_.InsertWebState(0, std::move(web_state),
activate ? WebStateList::INSERT_ACTIVATE activate ? WebStateList::INSERT_ACTIVATE
: WebStateList::INSERT_NO_FLAGS, : WebStateList::INSERT_NO_FLAGS,
...@@ -78,8 +77,8 @@ class AllWebStateObservationForwarderTest : public PlatformTest, ...@@ -78,8 +77,8 @@ class AllWebStateObservationForwarderTest : public PlatformTest,
TEST_F(AllWebStateObservationForwarderTest, TestInsertActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestInsertActiveWebState) {
// Insert two webstates into the list and mark the second one active. Send // Insert two webstates into the list and mark the second one active. Send
// observer notifications for both and verify the result. // observer notifications for both and verify the result.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
web_state_a->OnRenderProcessGone(); web_state_a->OnRenderProcessGone();
...@@ -93,8 +92,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestInsertActiveWebState) { ...@@ -93,8 +92,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestInsertActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestInsertNonActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestInsertNonActiveWebState) {
// Insert two webstates into the list, but do not mark the second one active. // Insert two webstates into the list, but do not mark the second one active.
// Send observer notifications for both and verify the result. // Send observer notifications for both and verify the result.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(false); web::FakeWebState* web_state_b = AddWebStateToList(false);
ASSERT_EQ(web_state_a, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_a, web_state_list_.GetActiveWebState());
web_state_a->OnRenderProcessGone(); web_state_a->OnRenderProcessGone();
...@@ -107,9 +106,9 @@ TEST_F(AllWebStateObservationForwarderTest, TestInsertNonActiveWebState) { ...@@ -107,9 +106,9 @@ TEST_F(AllWebStateObservationForwarderTest, TestInsertNonActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestDetachActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestDetachActiveWebState) {
// Insert three webstates into the list. // Insert three webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
web::TestWebState* web_state_c = AddWebStateToList(true); web::FakeWebState* web_state_c = AddWebStateToList(true);
ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState());
// Remove the active web state and send observer notifications. // Remove the active web state and send observer notifications.
...@@ -128,9 +127,9 @@ TEST_F(AllWebStateObservationForwarderTest, TestDetachActiveWebState) { ...@@ -128,9 +127,9 @@ TEST_F(AllWebStateObservationForwarderTest, TestDetachActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestDetachNonActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestDetachNonActiveWebState) {
// Insert three webstates into the list. // Insert three webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
web::TestWebState* web_state_c = AddWebStateToList(true); web::FakeWebState* web_state_c = AddWebStateToList(true);
ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_c, web_state_list_.GetActiveWebState());
// Remove a non-active web state and send observer notifications. // Remove a non-active web state and send observer notifications.
...@@ -151,14 +150,13 @@ TEST_F(AllWebStateObservationForwarderTest, TestDetachNonActiveWebState) { ...@@ -151,14 +150,13 @@ TEST_F(AllWebStateObservationForwarderTest, TestDetachNonActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestReplaceActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestReplaceActiveWebState) {
// Insert two webstates into the list and mark the second one active. // Insert two webstates into the list and mark the second one active.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Replace the active web state. Send notifications and verify the result. // Replace the active web state. Send notifications and verify the result.
std::unique_ptr<web::TestWebState> replacement_web_state( auto replacement_web_state(std::make_unique<web::FakeWebState>());
std::make_unique<web::TestWebState>()); web::FakeWebState* web_state_c = replacement_web_state.get();
web::TestWebState* web_state_c = replacement_web_state.get();
std::unique_ptr<web::WebState> detached_web_state = std::unique_ptr<web::WebState> detached_web_state =
web_state_list_.ReplaceWebStateAt( web_state_list_.ReplaceWebStateAt(
...@@ -177,8 +175,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestReplaceActiveWebState) { ...@@ -177,8 +175,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestReplaceActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestChangeActiveWebState) { TEST_F(AllWebStateObservationForwarderTest, TestChangeActiveWebState) {
// Insert two webstates into the list and mark the second one active. // Insert two webstates into the list and mark the second one active.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Make web state A active and send notifications. // Make web state A active and send notifications.
...@@ -205,8 +203,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestChangeActiveWebState) { ...@@ -205,8 +203,8 @@ TEST_F(AllWebStateObservationForwarderTest, TestChangeActiveWebState) {
TEST_F(AllWebStateObservationForwarderTest, TestNonEmptyInitialWebStateList) { TEST_F(AllWebStateObservationForwarderTest, TestNonEmptyInitialWebStateList) {
// Insert two webstates into the list. // Insert two webstates into the list.
web::TestWebState* web_state_a = AddWebStateToList(true); web::FakeWebState* web_state_a = AddWebStateToList(true);
web::TestWebState* web_state_b = AddWebStateToList(true); web::FakeWebState* web_state_b = AddWebStateToList(true);
ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState()); ASSERT_EQ(web_state_b, web_state_list_.GetActiveWebState());
// Recreate the multi observer to simulate creation with an already-populated // Recreate the multi observer to simulate creation with an already-populated
......
ios/chrome/browser/web_state_list/web_state_list_order_controller_unittest.mm
View file @ d37fbc0e
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h" #import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
#import "ios/chrome/browser/web_state_list/web_state_list.h" #import "ios/chrome/browser/web_state_list/web_state_list.h"
#import "ios/chrome/browser/web_state_list/web_state_opener.h" #import "ios/chrome/browser/web_state_list/web_state_opener.h"
#import "ios/web/public/test/fakes/test_navigation_manager.h" #import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h" #import "ios/web/public/test/fakes/fake_web_state.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h" #include "testing/platform_test.h"
...@@ -24,7 +24,7 @@ const char kURL[] = "https://chromium.org/"; ...@@ -24,7 +24,7 @@ const char kURL[] = "https://chromium.org/";
// A fake NavigationManager used to test opener-opened relationship in the // A fake NavigationManager used to test opener-opened relationship in the
// WebStateList. // WebStateList.
class FakeNavigationManager : public web::TestNavigationManager { class FakeNavigationManager : public web::FakeNavigationManager {
public: public:
FakeNavigationManager() = default; FakeNavigationManager() = default;
...@@ -48,7 +48,7 @@ class WebStateListOrderControllerTest : public PlatformTest { ...@@ -48,7 +48,7 @@ class WebStateListOrderControllerTest : public PlatformTest {
WebStateListOrderController order_controller_; WebStateListOrderController order_controller_;
void InsertNewWebState(int index, WebStateOpener opener) { void InsertNewWebState(int index, WebStateOpener opener) {
auto test_web_state = std::make_unique<web::TestWebState>(); auto test_web_state = std::make_unique<web::FakeWebState>();
test_web_state->SetCurrentURL(GURL(kURL)); test_web_state->SetCurrentURL(GURL(kURL));
test_web_state->SetNavigationManager( test_web_state->SetNavigationManager(
std::make_unique<FakeNavigationManager>()); std::make_unique<FakeNavigationManager>());
......
ios/chrome/browser/web_state_list/web_state_list_serialization_unittest.mm
View file @ d37fbc0e
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#import "ios/chrome/browser/web_state_list/web_state_opener.h" #import "ios/chrome/browser/web_state_list/web_state_opener.h"
#import "ios/web/public/session/crw_session_storage.h" #import "ios/web/public/session/crw_session_storage.h"
#import "ios/web/public/session/serializable_user_data_manager.h" #import "ios/web/public/session/serializable_user_data_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h" #import "ios/web/public/test/fakes/fake_web_state.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h" #include "testing/platform_test.h"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
namespace { namespace {
std::unique_ptr<web::WebState> CreateWebState() { std::unique_ptr<web::WebState> CreateWebState() {
return std::make_unique<web::TestWebState>(); return std::make_unique<web::FakeWebState>();
} }
std::unique_ptr<web::WebState> CreateWebStateWithSessionStorage( std::unique_ptr<web::WebState> CreateWebStateWithSessionStorage(
......
ios/chrome/browser/web_state_list/web_state_list_unittest.mm
View file @ d37fbc0e
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h" #import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
#import "ios/chrome/browser/web_state_list/web_state_list_observer.h" #import "ios/chrome/browser/web_state_list/web_state_list_observer.h"
#import "ios/chrome/browser/web_state_list/web_state_opener.h" #import "ios/chrome/browser/web_state_list/web_state_opener.h"
#import "ios/web/public/test/fakes/test_navigation_manager.h" #import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h" #import "ios/web/public/test/fakes/fake_web_state.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h" #include "testing/platform_test.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -126,7 +126,7 @@ class WebStateListTestObserver : public WebStateListObserver { ...@@ -126,7 +126,7 @@ class WebStateListTestObserver : public WebStateListObserver {
// A fake NavigationManager used to test opener-opened relationship in the // A fake NavigationManager used to test opener-opened relationship in the
// WebStateList. // WebStateList.
class FakeNavigationManager : public web::TestNavigationManager { class FakeNavigationManager : public web::FakeNavigationManager {
public: public:
FakeNavigationManager() = default; FakeNavigationManager() = default;
...@@ -173,12 +173,12 @@ class WebStateListTest : public PlatformTest { ...@@ -173,12 +173,12 @@ class WebStateListTest : public PlatformTest {
WebStateList web_state_list_; WebStateList web_state_list_;
WebStateListTestObserver observer_; WebStateListTestObserver observer_;
std::unique_ptr<web::TestWebState> CreateWebState(const char* url) { std::unique_ptr<web::FakeWebState> CreateWebState(const char* url) {
auto test_web_state = std::make_unique<web::TestWebState>(); auto fake_web_state = std::make_unique<web::FakeWebState>();
test_web_state->SetCurrentURL(GURL(url)); fake_web_state->SetCurrentURL(GURL(url));
test_web_state->SetNavigationManager( fake_web_state->SetNavigationManager(
std::make_unique<FakeNavigationManager>()); std::make_unique<FakeNavigationManager>());
return test_web_state; return fake_web_state;
} }
void AppendNewWebState(const char* url) { void AppendNewWebState(const char* url) {
...@@ -191,7 +191,7 @@ class WebStateListTest : public PlatformTest { ...@@ -191,7 +191,7 @@ class WebStateListTest : public PlatformTest {
WebStateList::INSERT_NO_FLAGS, opener); WebStateList::INSERT_NO_FLAGS, opener);
} }
void AppendNewWebState(std::unique_ptr<web::TestWebState> web_state) { void AppendNewWebState(std::unique_ptr<web::FakeWebState> web_state) {
web_state_list_.InsertWebState( web_state_list_.InsertWebState(
WebStateList::kInvalidIndex, std::move(web_state), WebStateList::kInvalidIndex, std::move(web_state),
WebStateList::INSERT_NO_FLAGS, WebStateOpener()); WebStateList::INSERT_NO_FLAGS, WebStateOpener());
...@@ -269,9 +269,9 @@ TEST_F(WebStateListTest, InsertActivate) { ...@@ -269,9 +269,9 @@ TEST_F(WebStateListTest, InsertActivate) {
// Tests finding a known webstate. // Tests finding a known webstate.
TEST_F(WebStateListTest, GetIndexOfWebState) { TEST_F(WebStateListTest, GetIndexOfWebState) {
std::unique_ptr<web::TestWebState> web_state_0 = CreateWebState(kURL0); auto web_state_0 = CreateWebState(kURL0);
web::WebState* target_web_state = web_state_0.get(); web::WebState* target_web_state = web_state_0.get();
std::unique_ptr<web::TestWebState> other_web_state = CreateWebState(kURL1); auto other_web_state = CreateWebState(kURL1);
// Target not yet in list. // Target not yet in list.
EXPECT_EQ(WebStateList::kInvalidIndex, EXPECT_EQ(WebStateList::kInvalidIndex,
......
ios/chrome/browser/web_state_list/web_state_opener_unittest.mm
View file @ d37fbc0e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include <memory> #include <memory>
#import "ios/web/public/test/fakes/test_navigation_manager.h" #import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h" #import "ios/web/public/test/fakes/fake_web_state.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h" #include "testing/platform_test.h"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
namespace { namespace {
class FakeNavigationManager : public web::TestNavigationManager { class FakeNavigationManager : public web::FakeNavigationManager {
public: public:
explicit FakeNavigationManager(int last_committed_item_index) explicit FakeNavigationManager(int last_committed_item_index)
: last_committed_item_index_(last_committed_item_index) {} : last_committed_item_index_(last_committed_item_index) {}
...@@ -40,10 +40,10 @@ class WebStateOpenerTest : public PlatformTest { ...@@ -40,10 +40,10 @@ class WebStateOpenerTest : public PlatformTest {
WebStateOpenerTest() = default; WebStateOpenerTest() = default;
std::unique_ptr<web::WebState> CreateWebState(int last_committed_item_index) { std::unique_ptr<web::WebState> CreateWebState(int last_committed_item_index) {
auto test_web_state = std::make_unique<web::TestWebState>(); auto web_state = std::make_unique<web::FakeWebState>();
test_web_state->SetNavigationManager( web_state->SetNavigationManager(
std::make_unique<FakeNavigationManager>(last_committed_item_index)); std::make_unique<FakeNavigationManager>(last_committed_item_index));
return test_web_state; return web_state;
} }
private: private:
......
ios/chrome/browser/web_state_list/web_usage_enabler/web_usage_enabler_browser_agent_unittest.mm
View file @ d37fbc0e
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#import "ios/chrome/browser/main/test_browser.h" #import "ios/chrome/browser/main/test_browser.h"
#import "ios/chrome/browser/web_state_list/web_state_list.h" #import "ios/chrome/browser/web_state_list/web_state_list.h"
#import "ios/chrome/browser/web_state_list/web_state_opener.h" #import "ios/chrome/browser/web_state_list/web_state_opener.h"
#import "ios/web/public/test/fakes/test_navigation_manager.h" #import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/test_web_state.h" #import "ios/web/public/test/fakes/fake_web_state.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h" #include "testing/platform_test.h"
...@@ -39,11 +39,11 @@ class WebUsageEnablerBrowserAgentTest : public PlatformTest { ...@@ -39,11 +39,11 @@ class WebUsageEnablerBrowserAgentTest : public PlatformTest {
WebStateList* web_state_list_; WebStateList* web_state_list_;
WebUsageEnablerBrowserAgent* enabler_; WebUsageEnablerBrowserAgent* enabler_;
std::unique_ptr<web::TestWebState> CreateWebState(const char* url) { std::unique_ptr<web::FakeWebState> CreateWebState(const char* url) {
auto test_web_state = std::make_unique<web::TestWebState>(); auto test_web_state = std::make_unique<web::FakeWebState>();
test_web_state->SetCurrentURL(GURL(url)); test_web_state->SetCurrentURL(GURL(url));
test_web_state->SetNavigationManager( test_web_state->SetNavigationManager(
std::make_unique<web::TestNavigationManager>()); std::make_unique<web::FakeNavigationManager>());
return test_web_state; return test_web_state;
} }
...@@ -62,8 +62,8 @@ class WebUsageEnablerBrowserAgentTest : public PlatformTest { ...@@ -62,8 +62,8 @@ class WebUsageEnablerBrowserAgentTest : public PlatformTest {
return false; return false;
web::WebState* last_web_state = web::WebState* last_web_state =
web_state_list_->GetWebStateAt(web_state_list_->count() - 1); web_state_list_->GetWebStateAt(web_state_list_->count() - 1);
web::TestNavigationManager* navigation_manager = web::FakeNavigationManager* navigation_manager =
static_cast<web::TestNavigationManager*>( static_cast<web::FakeNavigationManager*>(
last_web_state->GetNavigationManager()); last_web_state->GetNavigationManager());
return navigation_manager->LoadIfNecessaryWasCalled(); return navigation_manager->LoadIfNecessaryWasCalled();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment