WebShare: Centralize IsSupportedEnvironment for Windows Share tests

Centralizing the logic for checking for supported environments for
Windows Share related functionality. Also a small refactor to the
scoped_fake_data_transfer_manager_interop to make its initialization
explicit.

Bug: 1035527
Change-Id: Idee6f647745f95d415325a44856f09c5ff959af1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495397Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Commit-Queue: Hoch Hochkeppel <mhochk@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#820939}

chrome/browser/webshare/win/fake_data_transfer_manager.cc

@@ -8,6 +8,8 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/win/core_winrt_util.h"
+#include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace webshare {
@@ -269,6 +271,15 @@ class FakeDataRequestedEventArgs
 
 }  // namespace
 
+// static
+bool FakeDataTransferManager::IsSupportedEnvironment() {
+  if (base::win::ResolveCoreWinRTDelayload() &&
+      base::win::ScopedHString::ResolveCoreWinRTStringDelayload())
+    return true;
+  EXPECT_LT(base::win::GetVersion(), base::win::Version::WIN8);
+  return false;
+}
+
 FakeDataTransferManager::FakeDataTransferManager() = default;
 FakeDataTransferManager::~FakeDataTransferManager() = default;
 

chrome/browser/webshare/win/fake_data_transfer_manager.h

@@ -19,6 +19,8 @@ class FakeDataTransferManager
           Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::WinRtClassicComMix>,
           ABI::Windows::ApplicationModel::DataTransfer::IDataTransferManager> {
  public:
+  static bool IsSupportedEnvironment();
+
   FakeDataTransferManager();
   FakeDataTransferManager(const FakeDataTransferManager&) = delete;
   FakeDataTransferManager& operator=(const FakeDataTransferManager&) = delete;

chrome/browser/webshare/win/fake_data_transfer_manager_interop.cc

@@ -13,6 +13,11 @@
 
 namespace webshare {
 
+// static
+bool FakeDataTransferManagerInterop::IsSupportedEnvironment() {
+  return FakeDataTransferManager::IsSupportedEnvironment();
+}
+
 FakeDataTransferManagerInterop::FakeDataTransferManagerInterop() = default;
 
 FakeDataTransferManagerInterop::~FakeDataTransferManagerInterop() {

chrome/browser/webshare/win/fake_data_transfer_manager_interop.h

@@ -47,6 +47,8 @@ class FakeDataTransferManagerInterop
     SucceedWithoutAction
   };
 
+  static bool IsSupportedEnvironment();
+
   FakeDataTransferManagerInterop();
   FakeDataTransferManagerInterop(const FakeDataTransferManagerInterop&) =
       delete;

chrome/browser/webshare/win/fake_data_transfer_manager_interop_unittest.cc

@@ -55,8 +55,7 @@ class DataRequestedTestCallback {
 class FakeDataTransferManagerInteropTest : public ::testing::Test {
  protected:
   bool IsSupportedEnvironment() {
-    return base::win::ResolveCoreWinRTDelayload() &&
-           base::win::ScopedHString::ResolveCoreWinRTStringDelayload();
+    return FakeDataTransferManagerInterop::IsSupportedEnvironment();
   }
 
   void SetUp() override {

chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc

@@ -49,8 +49,7 @@ class DataRequestedTestCallback {
 class FakeDataTransferManagerTest : public ::testing::Test {
  protected:
   bool IsSupportedEnvironment() {
-    return base::win::ResolveCoreWinRTDelayload() &&
-           base::win::ScopedHString::ResolveCoreWinRTStringDelayload();
+    return FakeDataTransferManager::IsSupportedEnvironment();
   }
 
   void SetUp() override {

chrome/browser/webshare/win/scoped_fake_data_transfer_manager_interop.cc

@@ -38,26 +38,25 @@ static HRESULT FakeRoGetActivationFactory(HSTRING class_id,
 
 }  // namespace
 
-ScopedFakeDataTransferManagerInterop::ScopedFakeDataTransferManagerInterop() {
-  // Initialization work is done in an independent function so that the
-  // various test macros can be used.
-  Initialize();
+// static
+bool ScopedFakeDataTransferManagerInterop::IsSupportedEnvironment() {
+  return FakeDataTransferManagerInterop::IsSupportedEnvironment();
 }
 
-ScopedFakeDataTransferManagerInterop::~ScopedFakeDataTransferManagerInterop() {
-  g_current_fake_interop = nullptr;
-  ShowShareUIForWindowOperation::SetRoGetActivationFactoryFunctionForTesting(
-      &base::win::RoGetActivationFactory);
-}
+ScopedFakeDataTransferManagerInterop::ScopedFakeDataTransferManagerInterop() =
+    default;
 
-FakeDataTransferManagerInterop&
-ScopedFakeDataTransferManagerInterop::instance() {
-  return *(instance_.Get());
+ScopedFakeDataTransferManagerInterop::~ScopedFakeDataTransferManagerInterop() {
+  if (set_up_) {
+    g_current_fake_interop = nullptr;
+    ShowShareUIForWindowOperation::SetRoGetActivationFactoryFunctionForTesting(
+        &base::win::RoGetActivationFactory);
+  }
 }
 
-void ScopedFakeDataTransferManagerInterop::Initialize() {
-  ASSERT_TRUE(base::win::ResolveCoreWinRTDelayload());
-  ASSERT_TRUE(base::win::ScopedHString::ResolveCoreWinRTStringDelayload());
+void ScopedFakeDataTransferManagerInterop::SetUp() {
+  ASSERT_FALSE(set_up_);
+  ASSERT_TRUE(IsSupportedEnvironment());
   base::win::AssertComInitialized();
 
   instance_ = Microsoft::WRL::Make<FakeDataTransferManagerInterop>();
@@ -68,6 +67,14 @@ void ScopedFakeDataTransferManagerInterop::Initialize() {
   g_current_fake_interop = instance_.Get();
   ShowShareUIForWindowOperation::SetRoGetActivationFactoryFunctionForTesting(
       &FakeRoGetActivationFactory);
+
+  set_up_ = true;
+}
+
+FakeDataTransferManagerInterop&
+ScopedFakeDataTransferManagerInterop::instance() {
+  EXPECT_TRUE(set_up_);
+  return *(instance_.Get());
 }
 
 }  // namespace webshare

chrome/browser/webshare/win/scoped_fake_data_transfer_manager_interop.h

@@ -16,6 +16,8 @@ class FakeDataTransferManagerInterop;
 // for the Share contract.
 class ScopedFakeDataTransferManagerInterop {
  public:
+  static bool IsSupportedEnvironment();
+
   ScopedFakeDataTransferManagerInterop();
   ScopedFakeDataTransferManagerInterop(
       const ScopedFakeDataTransferManagerInterop&) = delete;
@@ -23,11 +25,15 @@ class ScopedFakeDataTransferManagerInterop {
       const ScopedFakeDataTransferManagerInterop&) = delete;
   ~ScopedFakeDataTransferManagerInterop();
 
+  // Initializes this component, creating test failures if anything does not
+  // succeed. Intended to be called from a test's SetUp function, after having
+  // verified this is a supported environment.
+  void SetUp();
+
   FakeDataTransferManagerInterop& instance();
 
  private:
-  void Initialize();
-
+  bool set_up_ = false;
   Microsoft::WRL::ComPtr<FakeDataTransferManagerInterop> instance_;
 };
 

chrome/browser/webshare/win/show_share_ui_for_window_operation_unittest.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/webshare/win/fake_data_transfer_manager_interop.h"
 #include "chrome/browser/webshare/win/scoped_fake_data_transfer_manager_interop.h"
 #include "content/public/test/browser_task_environment.h"
+#include "testing/gtest/include/gtest/gtest-spi.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ABI::Windows::ApplicationModel::DataTransfer::IDataRequest;
@@ -40,14 +41,13 @@ class ShowShareUIForWindowOperationTest : public ::testing::Test {
   enum TestCallbackState { NotRun = 0, RunWithoutValue, RunWithValue };
 
   bool IsSupportedEnvironment() {
-    return base::win::ResolveCoreWinRTDelayload() &&
-           base::win::ScopedHString::ResolveCoreWinRTStringDelayload();
+    return ScopedFakeDataTransferManagerInterop::IsSupportedEnvironment();
   }
 
   void SetUp() override {
     if (!IsSupportedEnvironment())
       return;
-    scoped_interop_ = std::make_unique<ScopedFakeDataTransferManagerInterop>();
+    ASSERT_NO_FATAL_FAILURE(scoped_interop_.SetUp());
     auto weak_ptr = weak_factory_.GetWeakPtr();
     test_callback_ = base::BindOnce(
         [](base::WeakPtr<ShowShareUIForWindowOperationTest> weak_ptr,
@@ -71,11 +71,11 @@ class ShowShareUIForWindowOperationTest : public ::testing::Test {
   }
 
   FakeDataTransferManagerInterop& fake_interop() {
-    return scoped_interop_->instance();
+    return scoped_interop_.instance();
   }
 
   const HWND hwnd_ = reinterpret_cast<HWND>(1);
-  std::unique_ptr<ScopedFakeDataTransferManagerInterop> scoped_interop_;
+  ScopedFakeDataTransferManagerInterop scoped_interop_;
   content::BrowserTaskEnvironment task_environment_{
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
   DataRequestedCallback test_callback_;