Commit d769acbd authored by Peter K. Lee's avatar Peter K. Lee Committed by Commit Bot

Tests LocationBarCoordinator in location_bar_coordinator_unittest.mm

It seems awfully strange that location_bar_coordinator_unittest.mm is
testing LocationBarLegacyCoordinator. It might have been a copy/paste
error from http://crrev/c/941131

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I0b9bf8d1cfa800fc2075618f9f98cb56ccfa86fd
Reviewed-on: https://chromium-review.googlesource.com/1125399
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: default avatarStepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572520}
parent 5f77a604
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/ui/location_bar/location_bar_legacy_coordinator.h" #import "ios/chrome/browser/ui/location_bar/location_bar_coordinator.h"
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -60,10 +60,9 @@ using variations::VariationsHttpHeaderProvider; ...@@ -60,10 +60,9 @@ using variations::VariationsHttpHeaderProvider;
namespace { namespace {
class LocationBarLegacyCoordinatorTest : public PlatformTest { class LocationBarCoordinatorTest : public PlatformTest {
protected: protected:
LocationBarLegacyCoordinatorTest() LocationBarCoordinatorTest() : web_state_list_(&web_state_list_delegate_) {}
: web_state_list_(&web_state_list_delegate_) {}
void SetUp() override { void SetUp() override {
PlatformTest::SetUp(); PlatformTest::SetUp();
...@@ -87,7 +86,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest { ...@@ -87,7 +86,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest {
delegate_ = [[TestToolbarCoordinatorDelegate alloc] init]; delegate_ = [[TestToolbarCoordinatorDelegate alloc] init];
url_loader_ = [[FakeURLLoader alloc] init]; url_loader_ = [[FakeURLLoader alloc] init];
coordinator_ = [[LocationBarLegacyCoordinator alloc] init]; coordinator_ = [[LocationBarCoordinator alloc] init];
coordinator_.browserState = browser_state_.get(); coordinator_.browserState = browser_state_.get();
coordinator_.webStateList = &web_state_list_; coordinator_.webStateList = &web_state_list_;
coordinator_.delegate = delegate_; coordinator_.delegate = delegate_;
...@@ -105,7 +104,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest { ...@@ -105,7 +104,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest {
} }
web::TestWebThreadBundle web_thread_bundle_; web::TestWebThreadBundle web_thread_bundle_;
LocationBarLegacyCoordinator* coordinator_; LocationBarCoordinator* coordinator_;
std::unique_ptr<TestChromeBrowserState> browser_state_; std::unique_ptr<TestChromeBrowserState> browser_state_;
FakeWebStateListDelegate web_state_list_delegate_; FakeWebStateListDelegate web_state_list_delegate_;
WebStateList web_state_list_; WebStateList web_state_list_;
...@@ -113,7 +112,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest { ...@@ -113,7 +112,7 @@ class LocationBarLegacyCoordinatorTest : public PlatformTest {
FakeURLLoader* url_loader_; FakeURLLoader* url_loader_;
}; };
TEST_F(LocationBarLegacyCoordinatorTest, Stops) { TEST_F(LocationBarCoordinatorTest, Stops) {
EXPECT_TRUE(coordinator_.view == nil); EXPECT_TRUE(coordinator_.view == nil);
[coordinator_ start]; [coordinator_ start];
EXPECT_TRUE(coordinator_.view != nil); EXPECT_TRUE(coordinator_.view != nil);
...@@ -124,7 +123,7 @@ TEST_F(LocationBarLegacyCoordinatorTest, Stops) { ...@@ -124,7 +123,7 @@ TEST_F(LocationBarLegacyCoordinatorTest, Stops) {
// Calls -loadGURLFromLocationBar:transition: with https://www.google.com/ URL. // Calls -loadGURLFromLocationBar:transition: with https://www.google.com/ URL.
// Verifies that URLLoader receives correct load request, which also includes // Verifies that URLLoader receives correct load request, which also includes
// variations header. // variations header.
TEST_F(LocationBarLegacyCoordinatorTest, LoadGoogleUrl) { TEST_F(LocationBarCoordinatorTest, LoadGoogleUrl) {
ASSERT_EQ(VariationsHttpHeaderProvider::ForceIdsResult::SUCCESS, ASSERT_EQ(VariationsHttpHeaderProvider::ForceIdsResult::SUCCESS,
VariationsHttpHeaderProvider::GetInstance()->ForceVariationIds( VariationsHttpHeaderProvider::GetInstance()->ForceVariationIds(
/*variation_ids=*/{"100"}, /*command_line_variation_ids=*/"")); /*variation_ids=*/{"100"}, /*command_line_variation_ids=*/""));
...@@ -146,7 +145,7 @@ TEST_F(LocationBarLegacyCoordinatorTest, LoadGoogleUrl) { ...@@ -146,7 +145,7 @@ TEST_F(LocationBarLegacyCoordinatorTest, LoadGoogleUrl) {
// Calls -loadGURLFromLocationBar:transition: with https://www.nongoogle.com/ // Calls -loadGURLFromLocationBar:transition: with https://www.nongoogle.com/
// URL. Verifies that URLLoader receives correct load request without variations // URL. Verifies that URLLoader receives correct load request without variations
// header. // header.
TEST_F(LocationBarLegacyCoordinatorTest, LoadNonGoogleUrl) { TEST_F(LocationBarCoordinatorTest, LoadNonGoogleUrl) {
ASSERT_EQ(VariationsHttpHeaderProvider::ForceIdsResult::SUCCESS, ASSERT_EQ(VariationsHttpHeaderProvider::ForceIdsResult::SUCCESS,
VariationsHttpHeaderProvider::GetInstance()->ForceVariationIds( VariationsHttpHeaderProvider::GetInstance()->ForceVariationIds(
/*variation_ids=*/{"100"}, /*command_line_variation_ids=*/"")); /*variation_ids=*/{"100"}, /*command_line_variation_ids=*/""));
......
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