Revert 194484 "Add the LoggedIn Predictor, to detect which websi..."

> Add the LoggedIn Predictor, to detect which websites a user is likely
> logged into (or has been logged into).
> R=shishir@chromium.org, bauerb@chromium.org
> 
> Review URL: https://codereview.chromium.org/13903018

TBR=tburkard@chromium.org

Review URL: https://codereview.chromium.org/13995007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194505 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browsing_data/browsing_data_remover.cc

@@ -30,9 +30,6 @@
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/predictors/logged_in_predictor_table.h"
-#include "chrome/browser/predictors/predictor_database.h"
-#include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -143,7 +140,6 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
       waiting_for_clear_history_(false),
       waiting_for_clear_hostname_resolution_cache_(false),
       waiting_for_clear_local_storage_(false),
-      waiting_for_clear_logged_in_predictor_(false),
       waiting_for_clear_nacl_cache_(false),
       waiting_for_clear_network_predictor_(false),
       waiting_for_clear_networking_history_(false),
@@ -343,9 +339,6 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
           base::Bind(&BrowsingDataRemover::ClearCookiesOnIOThread,
                      base::Unretained(this), base::Unretained(rq_context)));
     }
-    // Also delete the LoggedIn Predictor, which tries to keep track of which
-    // sites a user is logged into.
-    ClearLoggedInPredictor();
 
 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
     // Clear the safebrowsing cookies only if time period is for "all time".  It
@@ -581,7 +574,6 @@ bool BrowsingDataRemover::AllDone() {
       !waiting_for_clear_cookies_count_&&
       !waiting_for_clear_history_ &&
       !waiting_for_clear_local_storage_ &&
-      !waiting_for_clear_logged_in_predictor_ &&
       !waiting_for_clear_session_storage_ &&
       !waiting_for_clear_networking_history_ &&
       !waiting_for_clear_server_bound_certs_ &&
@@ -651,40 +643,6 @@ void BrowsingDataRemover::ClearHostnameResolutionCacheOnIOThread(
                  base::Unretained(this)));
 }
 
-void BrowsingDataRemover::OnClearedLoggedInPredictor() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(waiting_for_clear_logged_in_predictor_);
-  waiting_for_clear_logged_in_predictor_ = false;
-  NotifyAndDeleteIfDone();
-}
-
-void BrowsingDataRemover::ClearLoggedInPredictor() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!waiting_for_clear_logged_in_predictor_);
-
- predictors::PredictorDatabase* predictor_db =
-        predictors::PredictorDatabaseFactory::GetForProfile(profile_);
- if (!predictor_db)
-   return;
-
- predictors::LoggedInPredictorTable* logged_in_table =
-     predictor_db->logged_in_table();
- if (!logged_in_table)
-   return;
-
-  waiting_for_clear_logged_in_predictor_ = true;
-
-  BrowserThread::PostTaskAndReply(
-      BrowserThread::DB,
-      FROM_HERE,
-      base::Bind(&predictors::LoggedInPredictorTable::DeleteAllCreatedBetween,
-                 logged_in_table,
-                 delete_begin_,
-                 delete_end_),
-      base::Bind(&BrowsingDataRemover::OnClearedLoggedInPredictor,
-                 base::Unretained(this)));
-}
-
 void BrowsingDataRemover::OnClearedNetworkPredictor() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_network_predictor_ = false;

chrome/browser/browsing_data/browsing_data_remover.h

@@ -244,13 +244,6 @@ class BrowsingDataRemover : public content::NotificationObserver
   // Invoked on the IO thread to clear the hostname resolution cache.
   void ClearHostnameResolutionCacheOnIOThread(IOThread* io_thread);
 
-  // Callback when the LoggedIn Predictor has been cleared.
-  // Clears the respective waiting flag and invokes NotifyAndDeleteIfDone.
-  void OnClearedLoggedInPredictor();
-
-  // Clears the LoggedIn Predictor.
-  void ClearLoggedInPredictor();
-
   // Callback when speculative data in the network Predictor has been cleared.
   // Clears the respective waiting flag and invokes NotifyAndDeleteIfDone.
   void OnClearedNetworkPredictor();
@@ -409,7 +402,6 @@ class BrowsingDataRemover : public content::NotificationObserver
   bool waiting_for_clear_history_;
   bool waiting_for_clear_hostname_resolution_cache_;
   bool waiting_for_clear_local_storage_;
-  bool waiting_for_clear_logged_in_predictor_;
   bool waiting_for_clear_nacl_cache_;
   bool waiting_for_clear_network_predictor_;
   bool waiting_for_clear_networking_history_;

chrome/browser/predictors/logged_in_predictor_table.cc

-// Copyright (c) 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/predictors/logged_in_predictor_table.h"
-
-#include <algorithm>
-#include <utility>
-#include "base/logging.h"
-#include "base/metrics/histogram.h"
-#include "base/stringprintf.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-#include "sql/statement.h"
-
-using content::BrowserThread;
-using sql::Statement;
-using std::string;
-
-namespace {
-
-const char kTableName[] = "logged_in_predictor";
-
-}  // namespace
-
-namespace predictors {
-
-LoggedInPredictorTable::LoggedInPredictorTable()
-    : PredictorTableBase() {
-}
-
-LoggedInPredictorTable::~LoggedInPredictorTable() {
-}
-
-string LoggedInPredictorTable::GetKey(const GURL& url) const {
-  string effective_domain(
-      net::RegistryControlledDomainService::GetDomainAndRegistry(url.host()));
-  if (effective_domain.empty())
-    effective_domain = url.host();
-
-  // Strip off a preceding ".", if present.
-  if (!effective_domain.empty() && effective_domain[0] == '.')
-    return effective_domain.substr(1);
-  return effective_domain;
-}
-
-void LoggedInPredictorTable::Add(const GURL& url) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (CantAccessDatabase())
-    return;
-
-  Statement statement(DB()->GetCachedStatement(SQL_FROM_HERE,
-      base::StringPrintf("INSERT OR IGNORE INTO %s (domain, time) VALUES (?,?)",
-                         kTableName).c_str()));
-
-  statement.BindString(0, GetKey(url));
-  statement.BindInt64(1, base::Time::Now().ToInternalValue());
-
-  statement.Run();
-}
-
-void LoggedInPredictorTable::HasUserLoggedIn(const GURL& url, bool* is_present,
-                                             bool* lookup_succeeded) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  *lookup_succeeded = false;
-  if (CantAccessDatabase())
-    return;
-
-  Statement statement(DB()->GetCachedStatement(SQL_FROM_HERE,
-      base::StringPrintf("SELECT count(*) FROM %s WHERE domain=?",
-                         kTableName).c_str()));
-
-  statement.BindString(0, GetKey(url));
-
-  if (statement.Step()) {
-    *is_present = (statement.ColumnInt(0) > 0);
-    *lookup_succeeded = true;
-  }
-}
-
-void LoggedInPredictorTable::DeleteAllCreatedBetween(
-    const base::Time& delete_begin, const base::Time& delete_end) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (CantAccessDatabase())
-    return;
-
-  Statement statement(DB()->GetCachedStatement(SQL_FROM_HERE,
-      base::StringPrintf("DELETE FROM %s WHERE time >= ? AND time <= ?",
-                         kTableName).c_str()));
-
-  statement.BindInt64(0, delete_begin.ToInternalValue());
-  statement.BindInt64(1, delete_end.ToInternalValue());
-
-  statement.Run();
-}
-
-void LoggedInPredictorTable::CreateTableIfNonExistent() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (CantAccessDatabase())
-    return;
-
-  sql::Connection* db = DB();
-  if (db->DoesTableExist(kTableName))
-    return;
-
-  const char* table_creator =
-      "CREATE TABLE %s (domain TEXT, time INTEGER, PRIMARY KEY(domain))";
-
-  if (!db->Execute(base::StringPrintf(table_creator, kTableName).c_str()))
-    ResetDB();
-}
-
-void LoggedInPredictorTable::LogDatabaseStats()  {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (CantAccessDatabase())
-    return;
-
-  Statement statement(DB()->GetCachedStatement(SQL_FROM_HERE,
-      base::StringPrintf("SELECT count(*) FROM %s", kTableName).c_str()));
-  if (statement.Step())
-    UMA_HISTOGRAM_COUNTS("LoggedInPredictor.TableRowCount",
-                         statement.ColumnInt(0));
-}
-
-}  // namespace predictors

chrome/browser/predictors/logged_in_predictor_table.h

-// Copyright (c) 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.
-
-#ifndef CHROME_BROWSER_PREDICTORS_LOGGED_IN_PREDICTOR_TABLE_H_
-#define CHROME_BROWSER_PREDICTORS_LOGGED_IN_PREDICTOR_TABLE_H_
-
-#include <string>
-
-#include "base/time.h"
-#include "chrome/browser/predictors/predictor_table_base.h"
-#include "googleurl/src/gurl.h"
-
-namespace sql {
-class Statement;
-}
-
-namespace predictors {
-
-// Interface for database table to keep track of what sites a user is logged
-// in to.
-// All methods except the constructor and destructor need to be called on the DB
-// thread.
-// Manages one table { domain (primary key), added_timestamp }.
-class LoggedInPredictorTable : public PredictorTableBase {
- public:
-  // Adds the relevant part of the domain of the URL provided to the database
-  // as the user having performed a login action.
-  void Add(const GURL& url);
-  // Checks whether for the relevant part of the domain of the URL provided,
-  // the user has performed a login action in the past.
-  void HasUserLoggedIn(const GURL& url, bool* is_present,
-                       bool* lookup_succeeded);
-  void DeleteAllCreatedBetween(const base::Time& delete_begin,
-                               const base::Time& delete_end);
-
- private:
-  friend class PredictorDatabaseInternal;
-
-  LoggedInPredictorTable();
-  virtual ~LoggedInPredictorTable();
-
-  // PredictorTableBase methods.
-  virtual void CreateTableIfNonExistent() OVERRIDE;
-  virtual void LogDatabaseStats() OVERRIDE;
-
-  std::string GetKey(const GURL& url) const;
-
-  DISALLOW_COPY_AND_ASSIGN(LoggedInPredictorTable);
-};
-
-}  // namespace predictors
-
-#endif  // CHROME_BROWSER_PREDICTORS_LOGGED_IN_PREDICTOR_TABLE_H_

chrome/browser/predictors/predictor_database.cc

@@ -11,7 +11,6 @@
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_table.h"
-#include "chrome/browser/predictors/logged_in_predictor_table.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
@@ -59,7 +58,6 @@ class PredictorDatabaseInternal
   // TODO(shishir): These tables may not need to be refcounted. Maybe move them
   // to using a WeakPtr instead.
   scoped_refptr<AutocompleteActionPredictorTable> autocomplete_table_;
-  scoped_refptr<LoggedInPredictorTable> logged_in_table_;
   scoped_refptr<ResourcePrefetchPredictorTables> resource_prefetch_tables_;
 
   DISALLOW_COPY_AND_ASSIGN(PredictorDatabaseInternal);
@@ -92,7 +90,6 @@ void PredictorDatabaseInternal::Initialize() {
     return;
 
   autocomplete_table_->Initialize(db_.get());
-  logged_in_table_->Initialize(db_.get());
   resource_prefetch_tables_->Initialize(db_.get());
 
   LogDatabaseStats();
@@ -102,7 +99,6 @@ void PredictorDatabaseInternal::SetCancelled() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   autocomplete_table_->SetCancelled();
-  logged_in_table_->SetCancelled();
   resource_prefetch_tables_->SetCancelled();
 }
 
@@ -116,7 +112,6 @@ void PredictorDatabaseInternal::LogDatabaseStats() {
                           static_cast<int>(db_size / 1024));
 
   autocomplete_table_->LogDatabaseStats();
-  logged_in_table_->LogDatabaseStats();
   if (is_resource_prefetch_predictor_enabled_)
     resource_prefetch_tables_->LogDatabaseStats();
 }
@@ -139,11 +134,6 @@ scoped_refptr<AutocompleteActionPredictorTable>
   return db_->autocomplete_table_;
 }
 
-scoped_refptr<LoggedInPredictorTable>
-    PredictorDatabase::logged_in_table() {
-  return db_->logged_in_table_;
-}
-
 scoped_refptr<ResourcePrefetchPredictorTables>
     PredictorDatabase::resource_prefetch_tables() {
   return db_->resource_prefetch_tables_;

chrome/browser/predictors/predictor_database.h

@@ -17,7 +17,6 @@ class Connection;
 namespace predictors {
 
 class AutocompleteActionPredictorTable;
-class LoggedInPredictorTable;
 class PredictorDatabaseInternal;
 class ResourcePrefetchPredictorTables;
 
@@ -28,7 +27,6 @@ class PredictorDatabase : public ProfileKeyedService {
 
   scoped_refptr<AutocompleteActionPredictorTable> autocomplete_table();
   scoped_refptr<ResourcePrefetchPredictorTables> resource_prefetch_tables();
-  scoped_refptr<LoggedInPredictorTable> logged_in_table();
 
   // Used for testing.
   sql::Connection* GetDatabase();

chrome/browser/prerender/prerender_field_trial.cc

@@ -29,10 +29,6 @@ int g_omnibox_trial_default_group_number = kint32min;
 const char kLocalPredictorTrialName[] = "PrerenderLocalPredictor";
 const char kLocalPredictorEnabledGroup[] = "Enabled";
 
-const char kLoggedInPredictorTrialName[] = "PrerenderLoggedInPredictor";
-const char kLoggedInPredictorEnabledGroup[] = "Enabled";
-const char kLoggedInPredictorDisabledGroup[] = "Disabled";
-
 void SetupPrefetchFieldTrial() {
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
@@ -145,7 +141,6 @@ void SetupPrerenderFieldTrial() {
 }  // end namespace
 
 void ConfigureOmniboxPrerender();
-void ConfigureLoggedInPredictor();
 
 void ConfigurePrefetchAndPrerender(const CommandLine& command_line) {
   enum PrerenderOption {
@@ -202,7 +197,6 @@ void ConfigurePrefetchAndPrerender(const CommandLine& command_line) {
   }
 
   ConfigureOmniboxPrerender();
-  ConfigureLoggedInPredictor();
 }
 
 void ConfigureOmniboxPrerender() {
@@ -223,19 +217,6 @@ void ConfigureOmniboxPrerender() {
                                        kDisabledProbability);
 }
 
-void ConfigureLoggedInPredictor() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
-      channel == chrome::VersionInfo::CHANNEL_BETA) {
-    return;
-  }
-  scoped_refptr<FieldTrial> logged_in_predictor_trial(
-      FieldTrialList::FactoryGetFieldTrial(
-          kLoggedInPredictorTrialName, 100,
-          kLoggedInPredictorDisabledGroup, 2013, 12, 31, NULL));
-  logged_in_predictor_trial->AppendGroup(kLoggedInPredictorEnabledGroup, 100);
-}
-
 bool IsOmniboxEnabled(Profile* profile) {
   if (!profile)
     return false;
@@ -269,9 +250,4 @@ bool IsLocalPredictorEnabled() {
       kLocalPredictorEnabledGroup;
 }
 
-bool IsLoggedInPredictorEnabled() {
-  return base::FieldTrialList::FindFullName(kLoggedInPredictorTrialName) ==
-      kLoggedInPredictorEnabledGroup;
-}
-
 }  // namespace prerender

chrome/browser/prerender/prerender_field_trial.h

@@ -24,9 +24,6 @@ bool IsOmniboxEnabled(Profile* profile);
 // Returns true iff the Prerender Local Predictor is enabled.
 bool IsLocalPredictorEnabled();
 
-// Returns true iff the LoggedIn Predictor is enabled.
-bool IsLoggedInPredictorEnabled();
-
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_FIELD_TRIAL_H_

chrome/browser/prerender/prerender_manager.cc

@@ -22,9 +22,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/predictors/logged_in_predictor_table.h"
-#include "chrome/browser/predictors/predictor_database.h"
-#include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/prerender/prerender_condition.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
@@ -208,13 +205,6 @@ PrerenderManager::PrerenderManager(Profile* profile,
   if (IsLocalPredictorEnabled())
     local_predictor_.reset(new PrerenderLocalPredictor(this));
 
-  if (IsLoggedInPredictorEnabled() && !profile_->IsOffTheRecord()) {
-    predictors::PredictorDatabase* predictor_db =
-        predictors::PredictorDatabaseFactory::GetForProfile(profile);
-    if (predictor_db)
-      logged_in_predictor_table_ = predictor_db->logged_in_table();
-  }
-
   // Certain experiments override our default config_ values.
   switch (PrerenderManager::GetMode()) {
     case PrerenderManager::PRERENDER_MODE_EXPERIMENT_MULTI_PRERENDER_GROUP:
@@ -236,11 +226,6 @@ PrerenderManager::~PrerenderManager() {
   DCHECK(to_delete_prerenders_.empty());
 }
 
-scoped_refptr<predictors::LoggedInPredictorTable>
-PrerenderManager::logged_in_predictor_table() {
-  return logged_in_predictor_table_;
-}
-
 void PrerenderManager::Shutdown() {
   DestroyAllContents(FINAL_STATUS_MANAGER_SHUTDOWN);
   STLDeleteElements(&prerender_conditions_);

chrome/browser/prerender/prerender_manager.h

@@ -40,10 +40,6 @@ namespace gfx {
 class Size;
 }
 
-namespace predictors {
-class LoggedInPredictorTable;
-}
-
 #if defined(COMPILER_GCC)
 
 namespace BASE_HASH_NAMESPACE {
@@ -276,8 +272,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   virtual base::Time GetCurrentTime() const;
   virtual base::TimeTicks GetCurrentTimeTicks() const;
 
-  scoped_refptr<predictors::LoggedInPredictorTable> logged_in_predictor_table();
-
  protected:
   class PrerenderData : public base::SupportsWeakPtr<PrerenderData> {
    public:
@@ -579,8 +573,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   scoped_ptr<PrerenderLocalPredictor> local_predictor_;
 
-  scoped_refptr<predictors::LoggedInPredictorTable> logged_in_predictor_table_;
-
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 

chrome/browser/prerender/prerender_manager_factory.cc

@@ -7,7 +7,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
@@ -39,7 +38,6 @@ PrerenderManagerFactory::PrerenderManagerFactory()
   DependsOn(extensions::ExtensionSystemFactory::GetInstance());
   // PrerenderLocalPredictor observers the history visit DB.
   DependsOn(HistoryServiceFactory::GetInstance());
-  DependsOn(predictors::PredictorDatabaseFactory::GetInstance());
 }
 
 PrerenderManagerFactory::~PrerenderManagerFactory() {

chrome/browser/prerender/prerender_tab_helper.cc

@@ -7,18 +7,13 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
-#include "chrome/browser/predictors/logged_in_predictor_table.h"
 #include "chrome/browser/prerender/prerender_histograms.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "content/public/common/frame_navigate_params.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
@@ -133,8 +128,7 @@ class PrerenderTabHelper::PixelStats {
 };
 
 PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
-      weak_factory_(this) {
+    : content::WebContentsObserver(web_contents) {
 }
 
 PrerenderTabHelper::~PrerenderTabHelper() {
@@ -144,8 +138,6 @@ void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl(
     const GURL& url,
     content::RenderViewHost* render_view_host) {
   url_ = url;
-  RecordEvent(EVENT_MAINFRAME_CHANGE);
-  RecordEventIfLoggedInURL(EVENT_MAINFRAME_CHANGE_DOMAIN_LOGGED_IN, url);
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
@@ -162,9 +154,6 @@ void PrerenderTabHelper::DidCommitProvisionalLoadForFrame(
     content::RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;
-  RecordEvent(EVENT_MAINFRAME_COMMIT);
-  RecordEventIfLoggedInURL(EVENT_MAINFRAME_COMMIT_DOMAIN_LOGGED_IN,
-                           validated_url);
   url_ = validated_url;
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
@@ -221,40 +210,11 @@ void PrerenderTabHelper::DidStartProvisionalLoadForFrame(
   }
 }
 
-void PrerenderTabHelper::DidNavigateAnyFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) {
-  scoped_refptr<predictors::LoggedInPredictorTable> logged_in_table =
-      MaybeGetLoggedInTable();
-  if (params.password_form.origin.is_valid() && logged_in_table.get()) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::DB, FROM_HERE,
-        base::Bind(&predictors::LoggedInPredictorTable::Add,
-                   logged_in_table,
-                   params.url));
-    RecordEvent(EVENT_LOGIN_ACTION_ADDED);
-  }
-}
-
 PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const {
   return PrerenderManagerFactory::GetForProfile(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
 }
 
-scoped_refptr<predictors::LoggedInPredictorTable>
-PrerenderTabHelper::MaybeGetLoggedInTable() const {
-  RecordEvent(EVENT_LOGGED_IN_TABLE_REQUESTED);
-  PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
-  if (prerender_manager) {
-    predictors::LoggedInPredictorTable* result =
-        prerender_manager->logged_in_predictor_table();
-    if (result)
-      RecordEvent(EVENT_LOGGED_IN_TABLE_PRESENT);
-    return result;
-  }
-  return NULL;
-}
-
 bool PrerenderTabHelper::IsPrerendering() {
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
@@ -289,41 +249,4 @@ void PrerenderTabHelper::PrerenderSwappedIn() {
   }
 }
 
-void PrerenderTabHelper::RecordEvent(PrerenderTabHelper::Event event) const {
-  UMA_HISTOGRAM_ENUMERATION("Prerender.TabHelperEvent",
-                            event, PrerenderTabHelper::EVENT_MAX_VALUE);
-}
-
-void PrerenderTabHelper::RecordEventIfLoggedInURL(
-    PrerenderTabHelper::Event event, const GURL& url) {
-  scoped_refptr<predictors::LoggedInPredictorTable> logged_in_table =
-      MaybeGetLoggedInTable();
-  if (!logged_in_table.get())
-    return;
-  scoped_ptr<bool> is_present(new bool);
-  scoped_ptr<bool> lookup_succeeded(new bool);
-  bool* is_present_ptr = is_present.get();
-  bool* lookup_succeeded_ptr = lookup_succeeded.get();
-  content::BrowserThread::PostTaskAndReply(
-      content::BrowserThread::DB, FROM_HERE,
-      base::Bind(&predictors::LoggedInPredictorTable::HasUserLoggedIn,
-                 logged_in_table,
-                 url,
-                 is_present_ptr,
-                 lookup_succeeded_ptr),
-      base::Bind(&PrerenderTabHelper::RecordEventIfLoggedInURLResult,
-                 weak_factory_.GetWeakPtr(),
-                 event,
-                 base::Passed(&is_present),
-                 base::Passed(&lookup_succeeded)));
-}
-
-void PrerenderTabHelper::RecordEventIfLoggedInURLResult(
-    PrerenderTabHelper::Event event,
-    scoped_ptr<bool> is_present,
-    scoped_ptr<bool> lookup_succeeded) {
-  if (*lookup_succeeded && *is_present)
-    RecordEvent(event);
-}
-
 }  // namespace prerender

chrome/browser/prerender/prerender_tab_helper.h

@@ -6,16 +6,11 @@
 #define CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "googleurl/src/gurl.h"
 
-namespace predictors {
-class LoggedInPredictorTable;
-}
-
 namespace prerender {
 
 class PrerenderManager;
@@ -26,17 +21,6 @@ class PrerenderTabHelper
     : public content::WebContentsObserver,
       public content::WebContentsUserData<PrerenderTabHelper> {
  public:
-  enum Event {
-    EVENT_LOGGED_IN_TABLE_REQUESTED = 0,
-    EVENT_LOGGED_IN_TABLE_PRESENT = 1,
-    EVENT_MAINFRAME_CHANGE = 2,
-    EVENT_MAINFRAME_CHANGE_DOMAIN_LOGGED_IN = 3,
-    EVENT_MAINFRAME_COMMIT = 4,
-    EVENT_MAINFRAME_COMMIT_DOMAIN_LOGGED_IN = 5,
-    EVENT_LOGIN_ACTION_ADDED = 6,
-    EVENT_MAX_VALUE
-  };
-
   virtual ~PrerenderTabHelper();
 
   // content::WebContentsObserver implementation.
@@ -59,10 +43,6 @@ class PrerenderTabHelper
       const GURL& validated_url,
       content::PageTransition transition_type,
       content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidNavigateAnyFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-
   // Called when this prerendered WebContents has just been swapped in.
   void PrerenderSwappedIn();
 
@@ -70,10 +50,6 @@ class PrerenderTabHelper
   explicit PrerenderTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<PrerenderTabHelper>;
 
-  void RecordEvent(Event event) const;
-  void RecordEventIfLoggedInURL(Event event, const GURL& url);
-  void RecordEventIfLoggedInURLResult(Event event, scoped_ptr<bool> is_present,
-                                      scoped_ptr<bool> lookup_succeeded);
   // Helper class to compute pixel-based stats on the paint progress
   // between when a prerendered page is swapped in and when the onload event
   // fires.
@@ -83,10 +59,6 @@ class PrerenderTabHelper
   // Retrieves the PrerenderManager, or NULL, if none was found.
   PrerenderManager* MaybeGetPrerenderManager() const;
 
-  // Retrieves the LoggedInPredictorTable, or NULL, if none was found.
-  scoped_refptr<predictors::LoggedInPredictorTable>
-  MaybeGetLoggedInTable() const;
-
   // Returns whether the WebContents being observed is currently prerendering.
   bool IsPrerendering();
 
@@ -105,8 +77,6 @@ class PrerenderTabHelper
   // Current URL being loaded.
   GURL url_;
 
-  base::WeakPtrFactory<PrerenderTabHelper> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(PrerenderTabHelper);
 };
 

chrome/chrome_browser.gypi

@@ -1336,8 +1336,6 @@
         'browser/predictors/autocomplete_action_predictor_factory.h',
         'browser/predictors/autocomplete_action_predictor_table.cc',
         'browser/predictors/autocomplete_action_predictor_table.h',
-        'browser/predictors/logged_in_predictor_table.cc',
-        'browser/predictors/logged_in_predictor_table.h',
         'browser/predictors/predictor_database.cc',
         'browser/predictors/predictor_database.h',
         'browser/predictors/predictor_database_factory.cc',