c686e8f4fd
Automated patch, intended to be effectively a no-op. Context: https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer As of https://crrev.com/1204351, absl::optional is now a type alias for std::optional. We should migrate toward it. Script: ``` function replace { echo "Replacing $1 by $2" git grep -l "$1" \ | cut -f1 -d: \ | grep \ -e "^content" \ | sort \ | uniq \ | grep \ -e "\.h" \ -e "\.cc" \ -e "\.mm" \ -e "\.py" \ | xargs sed -i "s/$1/$2/g" } replace "absl::make_optional" "std::make_optional" replace "absl::optional" "std::optional" replace "absl::nullopt" "std::nullopt" replace "absl::in_place" "std::in_place" replace "absl::in_place_t" "std::in_place_t" replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>" git cl format ``` # Skipping unrelated "check_network_annotation" errors. NOTRY=True Bug: chromium:1500249 Change-Id: Icfd31a71d8faf63a2e8d5401127e7ee74cc1c413 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5185537 Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org> Owners-Override: Avi Drissman <avi@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/main@{#1245739}
104 lines
3.2 KiB
C++
104 lines
3.2 KiB
C++
// Copyright 2022 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "content/browser/preloading/preconnector.h"
|
|
|
|
#include "content/public/browser/anchor_element_preconnect_delegate.h"
|
|
#include "content/public/common/content_client.h"
|
|
#include "content/public/test/test_browser_context.h"
|
|
#include "content/public/test/test_renderer_host.h"
|
|
#include "content/test/test_content_browser_client.h"
|
|
#include "content/test/test_web_contents.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace content {
|
|
namespace {
|
|
|
|
class MockAnchorElementPreconnector : public AnchorElementPreconnectDelegate {
|
|
public:
|
|
explicit MockAnchorElementPreconnector(RenderFrameHost& render_frame_host) {}
|
|
~MockAnchorElementPreconnector() override = default;
|
|
|
|
void MaybePreconnect(const GURL& target) override { target_ = target; }
|
|
std::optional<GURL>& Target() { return target_; }
|
|
|
|
base::WeakPtr<MockAnchorElementPreconnector> AsWeakPtr() {
|
|
return weak_ptr_factory_.GetWeakPtr();
|
|
}
|
|
|
|
private:
|
|
std::optional<GURL> target_;
|
|
base::WeakPtrFactory<MockAnchorElementPreconnector> weak_ptr_factory_{this};
|
|
};
|
|
|
|
class MockContentBrowserClient : public TestContentBrowserClient {
|
|
public:
|
|
MockContentBrowserClient() {
|
|
old_browser_client_ = SetBrowserClientForTesting(this);
|
|
}
|
|
~MockContentBrowserClient() override {
|
|
EXPECT_EQ(this, SetBrowserClientForTesting(old_browser_client_));
|
|
}
|
|
|
|
std::unique_ptr<AnchorElementPreconnectDelegate>
|
|
CreateAnchorElementPreconnectDelegate(
|
|
RenderFrameHost& render_frame_host) override {
|
|
auto delegate =
|
|
std::make_unique<MockAnchorElementPreconnector>(render_frame_host);
|
|
delegate_ = delegate->AsWeakPtr();
|
|
return delegate;
|
|
}
|
|
|
|
base::WeakPtr<MockAnchorElementPreconnector> GetDelegate() {
|
|
return delegate_;
|
|
}
|
|
|
|
private:
|
|
raw_ptr<ContentBrowserClient> old_browser_client_ = nullptr;
|
|
base::WeakPtr<MockAnchorElementPreconnector> delegate_;
|
|
};
|
|
|
|
class PreconnectorTest : public RenderViewHostTestHarness {
|
|
public:
|
|
PreconnectorTest() = default;
|
|
void SetUp() override {
|
|
RenderViewHostTestHarness::SetUp();
|
|
|
|
browser_context_ = std::make_unique<TestBrowserContext>();
|
|
web_contents_ = TestWebContents::Create(
|
|
browser_context_.get(),
|
|
SiteInstanceImpl::Create(browser_context_.get()));
|
|
web_contents_->NavigateAndCommit(GURL("https://example.com"));
|
|
}
|
|
void TearDown() override {
|
|
web_contents_.reset();
|
|
browser_context_.reset();
|
|
RenderViewHostTestHarness::TearDown();
|
|
}
|
|
|
|
RenderFrameHostImpl& GetPrimaryMainFrame() {
|
|
return web_contents_->GetPrimaryPage().GetMainDocument();
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<TestBrowserContext> browser_context_;
|
|
std::unique_ptr<TestWebContents> web_contents_;
|
|
};
|
|
|
|
TEST_F(PreconnectorTest, MaybePreconnect) {
|
|
MockContentBrowserClient browser_client;
|
|
auto preconnector = Preconnector(GetPrimaryMainFrame());
|
|
base::WeakPtr<MockAnchorElementPreconnector> delegate =
|
|
browser_client.GetDelegate();
|
|
ASSERT_TRUE(delegate);
|
|
|
|
const auto url = GURL("https://example.com/page1");
|
|
preconnector.MaybePreconnect(url);
|
|
EXPECT_TRUE(delegate->Target().has_value());
|
|
EXPECT_EQ(url, delegate->Target().value());
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace content
|