Revert of Use new SafeBrowsing redirect tracking code in CWS pings.

chrome/browser/extensions/webstore_inline_installer.cc

Index: chrome/browser/extensions/webstore_inline_installer.cc
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
index 6816f21ea16bb8a3a3f2616bfb5e378a0d6185b3..82bf478ea0e794c9dd0a7feb9f868866b71deaee 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -9,11 +9,8 @@
 #include "base/json/json_writer.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/webstore_data_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/common/pref_names.h"
@@ -23,14 +20,6 @@
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
-using safe_browsing::SafeBrowsingNavigationObserverManager;
-using safe_browsing::ReferrerChain;
-
-namespace {
-
-// The number of user gestures to trace back for CWS pings.
-const int kExtensionReferrerUserGestureLimit = 2;
-}
 
 namespace extensions {
 
@@ -114,10 +103,6 @@
   return true;
 }
 
-bool WebstoreInlineInstaller::SafeBrowsingNavigationEventsEnabled() const {
-  return SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile());
-}
-
 std::string WebstoreInlineInstaller::GetJsonPostData() {
   // web_contents() might return null during tab destruction. This object would
   // also be destroyed shortly thereafter but check to be on the safe side.
@@ -129,69 +114,30 @@
   if (!profile()->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled))
     return std::string();
 
-  auto redirect_chain = base::MakeUnique<base::ListValue>();
-
-  if (SafeBrowsingNavigationEventsEnabled()) {
-    // If we have it, use the new referrer checker.
-    safe_browsing::SafeBrowsingService* safe_browsing_service =
-        g_browser_process->safe_browsing_service();
-    // May be null in some tests.
-    if (!safe_browsing_service)
-      return std::string();
-
-    scoped_refptr<SafeBrowsingNavigationObserverManager>
-        navigation_observer_manager =
-            safe_browsing_service->navigation_observer_manager();
-    // This may be null if the navigation observer manager feature is
-    // disabled by experiment.
-    if (!navigation_observer_manager)
-      return std::string();
-
-    ReferrerChain referrer_chain;
-    SafeBrowsingNavigationObserverManager::AttributionResult result =
-        navigation_observer_manager->IdentifyReferrerChainByWebContents(
-            web_contents(), kExtensionReferrerUserGestureLimit,
-            &referrer_chain);
-    if (result !=
-        SafeBrowsingNavigationObserverManager::NAVIGATION_EVENT_NOT_FOUND) {
-      // For now the CWS post data is JSON encoded. Consider moving it to a
-      // proto.
-      for (const auto& referrer_chain_entry : referrer_chain) {
-        // Referrer chain entries are a list of URLs in reverse chronological
-        // order, so the final URL is the last thing in the list and the initial
-        // landing page is the first thing in the list.
-        // Furthermore each entry may contain a series of server redirects
-        // stored in the same order.
-        redirect_chain->AppendString(referrer_chain_entry.url());
-        for (const auto& server_side_redirect :
-             referrer_chain_entry.server_redirect_chain()) {
-          redirect_chain->AppendString(server_side_redirect.url());
-        }
-      }
-    }
-  } else {
-    content::NavigationController& navigation_controller =
-        web_contents()->GetController();
-    content::NavigationEntry* navigation_entry =
-        navigation_controller.GetLastCommittedEntry();
-    if (navigation_entry) {
-      const std::vector<GURL>& redirect_urls =
-          navigation_entry->GetRedirectChain();
+  content::NavigationController& navigation_controller =
+      web_contents()->GetController();
+  content::NavigationEntry* navigation_entry =
+      navigation_controller.GetLastCommittedEntry();
+
+  if (navigation_entry) {
+    const std::vector<GURL>& redirect_urls =
+        navigation_entry->GetRedirectChain();
+
+    if (!redirect_urls.empty()) {
+      base::DictionaryValue dictionary;
+      dictionary.SetString("id", id());
+      dictionary.SetString("referrer", requestor_url_.spec());
+      std::unique_ptr<base::ListValue> redirect_chain =
+          base::MakeUnique<base::ListValue>();
       for (const GURL& url : redirect_urls) {
         redirect_chain->AppendString(url.spec());
       }
-    }
-  }
-
-  if (!redirect_chain->empty()) {
-    base::DictionaryValue dictionary;
-    dictionary.SetString("id", id());
-    dictionary.SetString("referrer", requestor_url_.spec());
-    dictionary.Set("redirect_chain", std::move(redirect_chain));
-
-    std::string json;
-    base::JSONWriter::Write(dictionary, &json);
-    return json;
+      dictionary.Set("redirect_chain", std::move(redirect_chain));
+
+      std::string json;
+      base::JSONWriter::Write(dictionary, &json);
+      return json;
+    }
   }
 
   return std::string();