Remove popup overlay from MHTML when requested

components/offline_pages/core/client_policy_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/offline_pages/core/client_policy_controller.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
@@ skipping 17 matching lines @@
           .SetExpirePeriod(base::TimeDelta::FromDays(2))
           .SetIsSupportedByRecentTabs(true)
           .SetIsOnlyShownInOriginalTab(true)
           .Build()));
   policies_.insert(std::make_pair(
       kAsyncNamespace,
       OfflinePageClientPolicyBuilder(kAsyncNamespace, LifetimeType::PERSISTENT,
                                      kUnlimitedPages, kUnlimitedPages)
           .SetIsSupportedByDownload(true)
           .SetIsRemovedOnCacheReset(false)
+          .SetRemovePopupOverlay(true)
           .Build()));
   policies_.insert(std::make_pair(
       kCCTNamespace,
       MakePolicy(kCCTNamespace, LifetimeType::TEMPORARY,
                  base::TimeDelta::FromDays(2), kUnlimitedPages, 1)));
   policies_.insert(std::make_pair(
       kDownloadNamespace, OfflinePageClientPolicyBuilder(
                               kDownloadNamespace, LifetimeType::PERSISTENT,
                               kUnlimitedPages, kUnlimitedPages)
                               .SetIsRemovedOnCacheReset(false)
@@ skipping 99 matching lines @@
 
   show_in_original_tab_cache_ = base::MakeUnique<std::vector<std::string>>();
   for (const auto& policy_item : policies_) {
     if (policy_item.second.feature_policy.only_shown_in_original_tab)
       show_in_original_tab_cache_->emplace_back(policy_item.first);
   }
 
   return *show_in_original_tab_cache_;
 }
 
+bool ClientPolicyController::ShouldRemovePopupOverlay(
+    const std::string& name_space) const {
+  return GetPolicy(name_space).feature_policy.remove_popup_overlay;
+}
+
 void ClientPolicyController::AddPolicyForTest(
     const std::string& name_space,
     const OfflinePageClientPolicyBuilder& builder) {
   policies_.insert(std::make_pair(name_space, builder.Build()));
 }
 
 }  // namespace offline_pages