Remove PrerenderManager.enabled_ and related members.

chrome/browser/prerender/prerender_manager.cc

 // Copyright (c) 2012 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/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 220 matching lines @@
       : url(url),
         time(time) {
   }
 
   GURL url;
   base::TimeTicks time;
 };
 
 PrerenderManager::PrerenderManager(Profile* profile,
                                    PrerenderTracker* prerender_tracker)
-    : enabled_(true),
-      profile_(profile),
+    : profile_(profile),
       prerender_tracker_(prerender_tracker),
       prerender_contents_factory_(PrerenderContents::CreateFactory()),
       last_prerender_start_time_(GetCurrentTimeTicks() -
           base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs)),
       prerender_history_(new PrerenderHistory(kHistoryLength)),
       histograms_(new PrerenderHistograms()),
       profile_network_bytes_(0),
       last_recorded_profile_network_bytes_(0),
       cookie_store_loaded_(false) {
   // There are some assumptions that the PrerenderManager is on the UI thread.
@@ skipping 481 matching lines @@
 
   if (navigation_type == NAVIGATION_TYPE_PRERENDERED) {
     histograms_->RecordPercentLoadDoneAtSwapin(
         origin, fraction_plt_elapsed_at_swap_in);
   }
   if (local_predictor_) {
     local_predictor_->OnPLTEventForURL(url, perceived_page_load_time);
   }
 }
 
-void PrerenderManager::set_enabled(bool enabled) {
-  DCHECK(CalledOnValidThread());
-  enabled_ = enabled;
-}
-
 // static
 PrerenderManager::PrerenderManagerMode PrerenderManager::GetMode() {
   return mode_;
 }
 
 // static
 void PrerenderManager::SetMode(PrerenderManagerMode mode) {
   mode_ = mode;
 }
 
@@ skipping 167 matching lines @@
 // static
 bool PrerenderManager::DoesSubresourceURLHaveValidScheme(const GURL& url) {
   return DoesURLHaveValidScheme(url) || url == GURL(url::kAboutBlankURL);
 }
 
 base::DictionaryValue* PrerenderManager::GetAsValue() const {
   DCHECK(CalledOnValidThread());
   base::DictionaryValue* dict_value = new base::DictionaryValue();
   dict_value->Set("history", prerender_history_->GetEntriesAsValue());
   dict_value->Set("active", GetActivePrerendersAsValue());
-  dict_value->SetBoolean("enabled", enabled_);
   dict_value->SetBoolean("omnibox_enabled", IsOmniboxEnabled(profile_));

[mmenke, 2014/09/03 14:30:55]

Should keep the value you removed here, and just set it to IsEnabled().

Maybe it should really be IsEnabled() && IsPrerenderingPossible(), but think
that's beyond the scope of this CL, and I may be forgetting something.

[Bence, 2014/09/03 17:05:18]

Done.

   // If prerender is disabled via a flag this method is not even called.
   std::string enabled_note;
   if (IsControlGroup(kNoExperiment))
     enabled_note += "(Control group: Not actually prerendering) ";
   if (IsNoUseGroup())
     enabled_note += "(No-use group: Not swapping in prerendered pages) ";
   if (GetMode() == PRERENDER_MODE_EXPERIMENT_15MIN_TTL_GROUP)
     enabled_note +=
         "(15 min TTL group: Extended prerender eviction to 15 mins) ";
   dict_value->SetString("enabled_note", enabled_note);
@@ skipping 906 matching lines @@
       profile_network_bytes_ - last_recorded_profile_network_bytes_;
   last_recorded_profile_network_bytes_ = profile_network_bytes_;
   DCHECK_GE(recent_profile_bytes, 0);
   histograms_->RecordNetworkBytes(
       origin, used, prerender_bytes, recent_profile_bytes);
 }
 
 bool PrerenderManager::IsEnabled() const {
   DCHECK(CalledOnValidThread());
 
-  if (!enabled_)
-    return false;
   return chrome_browser_net::CanPrefetchAndPrerenderUI(profile_->GetPrefs());
 }
 
 void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) {
   DCHECK_GE(bytes, 0);
   if (IsEnabled() && ActuallyPrerendering())
     profile_network_bytes_ += bytes;
 }
 
 void PrerenderManager::OnCookieStoreLoaded() {
@@ skipping 26 matching lines @@
     content::RenderProcessHost* host) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prerender_process_hosts_.erase(host);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrerenderTracker::RemovePrerenderCookieStoreOnIOThread,
                  base::Unretained(prerender_tracker()), host->GetID(), false));
 }
 
 }  // namespace prerender