Placing SRT Prompt on Feedback form behind Finch feature.

chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 14 matching lines @@
 #include "components/feedback/tracing_manager.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/event_router.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "url/url_util.h"
 
 #if defined(OS_WIN)
+#include "base/feature_list.h"
 #include "chrome/browser/safe_browsing/srt_fetcher_win.h"
+#include "chrome/common/extensions/api/feedback_private.h"

[afakhry, 2016/06/27 19:59:53]

Nit: Please remove this include. This file is already included in the .h file.

 #endif
 
 using extensions::api::feedback_private::SystemInformation;
 using feedback::FeedbackData;
 
 namespace {
 
 // Getting the filename of a blob prepends a "C:\fakepath" to the filename.
 // This is undesirable, strip it if it exists.
 std::string StripFakepath(const std::string& path) {
   const char kFakePathStr[] = "C:\\fakepath\\";
   if (base::StartsWith(path, kFakePathStr,
                        base::CompareCase::INSENSITIVE_ASCII))
     return path.substr(arraysize(kFakePathStr) - 1);
   return path;
 }
 
+#if defined(OS_WIN)
+// Allows enabling/disabling SRT Prompt as a Variations feature.
+constexpr base::Feature kSrtPromptOnFeedbackForm {
+  "SrtPromptOnFeedbackForm", base::FEATURE_DISABLED_BY_DEFAULT
+};
+#endif
+
 }  // namespace
 
 namespace extensions {
 
 namespace feedback_private = api::feedback_private;
 
 using feedback_private::SystemInformation;
 using feedback_private::FeedbackInfo;
 using feedback_private::FeedbackFlow;
 
@@ skipping 16 matching lines @@
 }
 
 FeedbackService* FeedbackPrivateAPI::GetService() const {
   return service_;
 }
 
 void FeedbackPrivateAPI::RequestFeedback(
     const std::string& description_template,
     const std::string& category_tag,
     const GURL& page_url) {
+

[afakhry, 2016/06/27 19:59:53]

Nit: Remove this line.

 #if defined(OS_WIN)
   // Show prompt for Software Removal Tool if the Reporter component has found
   // unwanted software, and the user has never run the cleaner before.
-  if (safe_browsing::ReporterFoundUws() &&
+  if (base::FeatureList::IsEnabled(kSrtPromptOnFeedbackForm) &&
+      safe_browsing::ReporterFoundUws() &&
       !safe_browsing::UserHasRunCleaner()) {
     RequestFeedbackForFlow(description_template, category_tag, page_url,
                            FeedbackFlow::FEEDBACK_FLOW_SHOWSRTPROMPT);
     return;
   }
 #endif
-
   RequestFeedbackForFlow(description_template, category_tag, page_url,
                          FeedbackFlow::FEEDBACK_FLOW_REGULAR);
 }
 
 void FeedbackPrivateAPI::RequestFeedbackForFlow(
     const std::string& description_template,
     const std::string& category_tag,
     const GURL& page_url,
     api::feedback_private::FeedbackFlow flow) {
   if (browser_context_ && EventRouter::Get(browser_context_)) {
@@ skipping 202 matching lines @@
       content::RecordAction(
           base::UserMetricsAction("Feedback.SrtPromptClosed"));
       break;
     default:
       return RespondNow(Error("Invalid arugment."));
   }
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions