Remove MS Store experiment code (mozilla#11090)

bedrock/firefox/templates/firefox/new/desktop/download.html

@@ -23,14 +23,6 @@
   {% endif %}
 {% endblock %}
 
-{% set show_firefox_ms_store_exp = switch('experiment-firefox-ms-store', ['en']) and country_code in ["US", "CA"] %}
-
-{% block experiments %}
-  {% if show_firefox_ms_store_exp %}
-    {{ js_bundle('firefox-ms-store-exp') }}
-  {% endif %}
-{% endblock %}
-
 {% block extrahead %}
   {{ super() }}
   {{ css_bundle('protocol-card') }}
@@ -97,9 +89,7 @@ <h1 class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-firefox">{{ ftl('firef
           <h2 class="mzp-has-zap-7">{{ ftl('firefox-desktop-download-get-the-browser') }}</h2>
           <p>{{ ftl('firefox-desktop-download-no-shady') }}</p>
         <div class="c-intro-download">
-          {% block firefox_primary_download_cta %}
-            {{ download_firefox_thanks(locale_in_transition=True, download_location='primary cta') }}
-          {% endblock %}
+          {{ download_firefox_thanks(locale_in_transition=True, download_location='primary cta') }}
 
           <div class="c-intro-download-alt"><a href="{{ url('firefox.all') }}">{{ ftl('firefox-desktop-download-download-options') }}</a></div>
 
@@ -394,9 +384,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-customize-your-brows
           </ul>
         </div>
       </div>
-      {% block firefox_secondary_download_cta %}
-        {{ download_firefox_thanks(dom_id='download-features', locale_in_transition=True, download_location='features cta') }}
-      {% endblock %}
+      {{ download_firefox_thanks(dom_id='download-features', locale_in_transition=True, download_location='features cta') }}
 
     </div>
   </section>
@@ -557,9 +545,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-picture-in-picture')
         <p>{{ ftl('firefox-desktop-download-from-watching-a') }}</p>
       </div>
     </div>
-    {% block firefox_tertiary_download_cta %}
-      {{ download_firefox_thanks(dom_id='download-discover', locale_in_transition=True, download_location='discover cta') }}
-    {% endblock %}
+    {{ download_firefox_thanks(dom_id='download-discover', locale_in_transition=True, download_location='discover cta') }}
   </section>
 
   <section class="c-support">

bedrock/firefox/tests/test_views.py

@@ -431,28 +431,6 @@ def test_thanks_basic_direct(self, render_mock):
 
     # end /thanks?s=direct URL - issue 10520
 
-    # begin firefox ms store experiment tests - issue 11090
-
-    @patch.object(views, "ftl_file_is_active", lambda *x: True)
-    def test_ms_store_exp_v1(self, render_mock):
-        req = RequestFactory().get("/firefox/new/?experiment=mozorg-firefox-vsinstaller-exp&variation=control")
-        req.locale = "en-US"
-        view = views.NewView.as_view()
-        view(req)
-        template = render_mock.call_args[0][1]
-        assert template == ["firefox/new/desktop/download.html"]
-
-    @patch.object(views, "ftl_file_is_active", lambda *x: True)
-    def test_ms_store_exp_v2(self, render_mock):
-        req = RequestFactory().get("/firefox/new/?experiment=mozorg-firefox-vsinstaller-exp&variation=treatment")
-        req.locale = "en-US"
-        view = views.NewView.as_view()
-        view(req)
-        template = render_mock.call_args[0][1]
-        assert template == ["firefox/new/desktop/download-ms-store.html"]
-
-    # end firefox ms store experiment tests - issue 11090
-
 
 class TestFirefoxNewNoIndex(TestCase):
     def test_download_noindex(self):

bedrock/firefox/views.py

@@ -661,15 +661,14 @@ class NewView(L10nTemplateView):
     ftl_files_map = {
         "firefox/new/basic/base_download.html": ["firefox/new/download"],
         "firefox/new/desktop/download.html": ["firefox/new/desktop"],
-        "firefox/new/desktop/download-ms-store.html": ["firefox/new/desktop"],
     }
     activation_files = [
         "firefox/new/download",
         "firefox/new/desktop",
     ]
 
     # place expected ?v= values in this list
-    variations = ["control", "treatment"]
+    variations = []
 
     def get(self, *args, **kwargs):
         # Remove legacy query parameters (Bug 1236791)
@@ -710,18 +709,13 @@ def get_context_data(self, **kwargs):
     def get_template_names(self):
         variation = self.request.GET.get("variation", None)
         experience = self.request.GET.get("xv", None)
-        experiment = self.request.GET.get("experiment", None)
-        locale = l10n_utils.get_locale(self.request)
 
         # ensure variant matches pre-defined value
         if variation not in self.variations:
             variation = None
 
         if ftl_file_is_active("firefox/new/desktop") and experience != "basic":
-            if locale.startswith("en-") and experiment == "mozorg-firefox-vsinstaller-exp" and variation == "treatment":
-                template = "firefox/new/desktop/download-ms-store.html"
-            else:
-                template = "firefox/new/desktop/download.html"
+            template = "firefox/new/desktop/download.html"
         else:
             template = "firefox/new/basic/base_download.html"
 

media/static-bundles.json

@@ -1338,12 +1338,6 @@
       ],
       "name": "firefox_new_thanks_direct"
     },
-    {
-      "files": [
-        "js/firefox/new/desktop/download-ms-store-exp.es6.js"
-      ],
-      "name": "firefox-ms-store-exp"
-    },
     {
       "files": [
         "js/base/stub-attribution/stub-attribution.js",