Revert 89178 - Create a browser feature extractor that runs after the renderer has

chrome/browser/safe_browsing/client_side_detection_host.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
 class TabContents;
 
 namespace safe_browsing {
-class BrowserFeatureExtractor;
-class ClientPhishingRequest;
+
 class ClientSideDetectionService;
 
 // This class is used to receive the IPC from the renderer which
 // notifies the browser that a URL was classified as phishing.  This
 // class relays this information to the client-side detection service
 // class which sends a ping to a server to validate the verdict.
 // TODO(noelutz): move all client-side detection IPCs to this class.
 class ClientSideDetectionHost : public TabContentsObserver {
  public:
   // The caller keeps ownership of the tab object and is responsible for
@@ skipping 19 matching lines @@
   explicit ClientSideDetectionHost(TabContents* tab);
 
   // Verdict is an encoded ClientPhishingRequest protocol message.
   void OnDetectedPhishingSite(const std::string& verdict);
 
   // Callback that is called when the server ping back is
   // done. Display an interstitial if |is_phishing| is true.
   // Otherwise, we do nothing.  Called in UI thread.
   void MaybeShowPhishingWarning(GURL phishing_url, bool is_phishing);
 
-  // Callback that is called when the browser feature extractor is done.
-  // This method is responsible for deleting the request object.  Called on
-  // the UI thread.
-  void FeatureExtractionDone(bool success, ClientPhishingRequest* request);
-
   // Used for testing.  This function does not take ownership of the service
   // class.
   void set_client_side_detection_service(ClientSideDetectionService* service);
 
   // Used for testing.  This function does not take ownership of the service
   // class.
   void set_safe_browsing_service(SafeBrowsingService* service);
 
   // This pointer may be NULL if client-side phishing detection is disabled.
   ClientSideDetectionService* csd_service_;
   // This pointer may be NULL if SafeBrowsing is disabled.
   scoped_refptr<SafeBrowsingService> sb_service_;
   // Keep a handle to the latest classification request so that we can cancel
   // it if necessary.
   scoped_refptr<ShouldClassifyUrlRequest> classification_request_;
-  // Browser-side feature extractor.
-  scoped_ptr<BrowserFeatureExtractor> feature_extractor_;
 
   base::ScopedCallbackFactory<ClientSideDetectionHost> cb_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionHost);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_