Commit 74924155 authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

Revert "WebShare: Windows Implementation"

This reverts commit 83e275fd.

Reason for revert: ShareServiceUnitTest.Multimedia started failing on
multiple Windows bots. This is likely the culprit.

Original change's description:
> WebShare: Windows Implementation
>
> Completing the implementation of navigator.share() for Windows by
> hooking in the relevant components and updating the corresponding tests.
>
> Originally committed as part of https://crrev.com/c/2443757, but
> reverted due to test issues. Patchset 1 is a cherry pick of this
> original change (reduced to the files relevant to this portion) for
> easy comparison.
>
> Bug: 1035527
> Change-Id: Ic83fa002601cce5e6c03eee9ec214f7c4c209096
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505603
> Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
> Commit-Queue: Hoch Hochkeppel <mhochk@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#821941}

TBR=ericwilligers@chromium.org,mhochk@microsoft.com

Change-Id: I04727e14ee724e8526b4ee8b79ed0705c37dd8b5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1035527
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2506574Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822084}
parent 2560dd8f
...@@ -13,47 +13,17 @@ ...@@ -13,47 +13,17 @@
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#if defined(OS_WIN)
#include "chrome/browser/webshare/win/scoped_share_operation_fake_components.h"
#endif
class ShareServiceBrowserTest : public InProcessBrowserTest { class ShareServiceBrowserTest : public InProcessBrowserTest {
public: public:
ShareServiceBrowserTest() { ShareServiceBrowserTest() {
feature_list_.InitAndEnableFeature(features::kWebShare); feature_list_.InitAndEnableFeature(features::kWebShare);
} }
#if defined(OS_WIN)
void SetUpOnMainThread() override {
InProcessBrowserTest::SetUpOnMainThread();
if (!IsSupportedEnvironment())
return;
ASSERT_NO_FATAL_FAILURE(scoped_fake_components_.SetUp());
}
#endif
protected:
#if defined(OS_WIN)
bool IsSupportedEnvironment() {
return webshare::ScopedShareOperationFakeComponents::
IsSupportedEnvironment();
}
#endif
private: private:
base::test::ScopedFeatureList feature_list_; base::test::ScopedFeatureList feature_list_;
#if defined(OS_WIN)
webshare::ScopedShareOperationFakeComponents scoped_fake_components_;
#endif
}; };
IN_PROC_BROWSER_TEST_F(ShareServiceBrowserTest, Text) { IN_PROC_BROWSER_TEST_F(ShareServiceBrowserTest, Text) {
#if defined(OS_WIN)
if (!IsSupportedEnvironment())
return;
#endif
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/webshare/index.html")); browser(), embedded_test_server()->GetURL("/webshare/index.html"));
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "chrome/browser/webshare/share_service_impl.h" #include "chrome/browser/webshare/share_service_impl.h"
#include <algorithm> #include <algorithm>
#include <memory>
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
...@@ -14,10 +13,6 @@ ...@@ -14,10 +13,6 @@
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
#if defined(OS_WIN)
#include "chrome/browser/webshare/win/share_operation.h"
#endif
// IsDangerousFilename() and IsDangerousMimeType() should be kept in sync with // IsDangerousFilename() and IsDangerousMimeType() should be kept in sync with
// //third_party/blink/renderer/modules/webshare/FILE_TYPES.md // //third_party/blink/renderer/modules/webshare/FILE_TYPES.md
// //components/browser_ui/webshare/android/java/src/org/chromium/components/browser_ui/webshare/ShareServiceImpl.java // //components/browser_ui/webshare/android/java/src/org/chromium/components/browser_ui/webshare/ShareServiceImpl.java
...@@ -170,17 +165,10 @@ void ShareServiceImpl::Share(const std::string& title, ...@@ -170,17 +165,10 @@ void ShareServiceImpl::Share(const std::string& title,
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
sharesheet_client_.Share(title, text, share_url, std::move(files), sharesheet_client_.Share(title, text, share_url, std::move(files),
std::move(callback)); std::move(callback));
#elif defined(OS_WIN)
auto share_operation = std::make_unique<webshare::ShareOperation>(
title, text, share_url, std::move(files), web_contents);
share_operation->Run(base::BindOnce(
[](std::unique_ptr<webshare::ShareOperation> share_operation,
ShareCallback callback,
blink::mojom::ShareError result) { std::move(callback).Run(result); },
std::move(share_operation), std::move(callback)));
#else #else
NOTREACHED(); // TODO(crbug.com/1035527): Add implementation for OS_WIN
std::move(callback).Run(blink::mojom::ShareError::INTERNAL_ERROR); NOTIMPLEMENTED();
std::move(callback).Run(blink::mojom::ShareError::OK);
#endif #endif
} }
......
...@@ -29,9 +29,6 @@ using blink::mojom::ShareError; ...@@ -29,9 +29,6 @@ using blink::mojom::ShareError;
#include "chrome/browser/sharesheet/sharesheet_types.h" #include "chrome/browser/sharesheet/sharesheet_types.h"
#include "chrome/browser/webshare/chromeos/sharesheet_client.h" #include "chrome/browser/webshare/chromeos/sharesheet_client.h"
#endif #endif
#if defined(OS_WIN)
#include "chrome/browser/webshare/win/scoped_share_operation_fake_components.h"
#endif
class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness { class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness {
public: public:
...@@ -47,22 +44,9 @@ class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness { ...@@ -47,22 +44,9 @@ class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
webshare::SharesheetClient::SetSharesheetCallbackForTesting( webshare::SharesheetClient::SetSharesheetCallbackForTesting(
base::BindRepeating(&ShareServiceUnitTest::AcceptShareRequest)); base::BindRepeating(&ShareServiceUnitTest::AcceptShareRequest));
#endif
#if defined(OS_WIN)
if (!IsSupportedEnvironment())
return;
ASSERT_NO_FATAL_FAILURE(scoped_fake_components_.SetUp());
#endif #endif
} }
#if defined(OS_WIN)
bool IsSupportedEnvironment() {
return webshare::ScopedShareOperationFakeComponents::
IsSupportedEnvironment();
}
#endif
ShareError ShareGeneratedFileData(const std::string& extension, ShareError ShareGeneratedFileData(const std::string& extension,
const std::string& content_type, const std::string& content_type,
unsigned file_length = 100, unsigned file_length = 100,
...@@ -139,19 +123,11 @@ class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness { ...@@ -139,19 +123,11 @@ class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness {
} }
#endif #endif
#if defined(OS_WIN)
webshare::ScopedShareOperationFakeComponents scoped_fake_components_;
#endif
base::test::ScopedFeatureList feature_list_; base::test::ScopedFeatureList feature_list_;
std::unique_ptr<ShareServiceImpl> share_service_; std::unique_ptr<ShareServiceImpl> share_service_;
}; };
TEST_F(ShareServiceUnitTest, FileCount) { TEST_F(ShareServiceUnitTest, FileCount) {
#if defined(OS_WIN)
if (!IsSupportedEnvironment())
return;
#endif
EXPECT_EQ(ShareError::OK, ShareGeneratedFileData(".txt", "text/plain", 1234, EXPECT_EQ(ShareError::OK, ShareGeneratedFileData(".txt", "text/plain", 1234,
kMaxSharedFileCount)); kMaxSharedFileCount));
EXPECT_EQ(ShareError::PERMISSION_DENIED, EXPECT_EQ(ShareError::PERMISSION_DENIED,
...@@ -196,11 +172,6 @@ TEST_F(ShareServiceUnitTest, Multimedia) { ...@@ -196,11 +172,6 @@ TEST_F(ShareServiceUnitTest, Multimedia) {
} }
TEST_F(ShareServiceUnitTest, PortableDocumentFormat) { TEST_F(ShareServiceUnitTest, PortableDocumentFormat) {
#if defined(OS_WIN)
if (!IsSupportedEnvironment())
return;
#endif
// TODO(crbug.com/1006055): Support sharing of pdf files. // TODO(crbug.com/1006055): Support sharing of pdf files.
// The URL will be checked using Safe Browsing. // The URL will be checked using Safe Browsing.
EXPECT_EQ(ShareError::PERMISSION_DENIED, EXPECT_EQ(ShareError::PERMISSION_DENIED,
......
...@@ -347,7 +347,6 @@ static_library("test_support") { ...@@ -347,7 +347,6 @@ static_library("test_support") {
"//components/crash/core/app", "//components/crash/core/app",
"//third_party/wtl", "//third_party/wtl",
] ]
libs = [ "runtimeobject.lib" ]
} }
if (is_chromeos) { if (is_chromeos) {
......
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