Remove PrerenderCondition*.

Cleanup:  https://crrev.com/516443002/ obsoleted PrerenderCondition* classes.

BUG=406583

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

Cr-Commit-Position: refs/heads/master@{#293151}

10 files changed, 0 insertions, 189 deletions

diff --git a/chrome/browser/android/prerender_condition_platform.cc b/chrome/browser/android/prerender_condition_platform.cc
deleted file mode 100644
index fab60b9..0000000
--- a/chrome/browser/android/prerender_condition_platform.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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 "base/prefs/pref_service.h"
-#include "chrome/browser/android/prerender_condition_platform.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/pref_names.h"
-
-namespace android {
-
-namespace {
-
-const char kAllowPrerender[] = "allow-prerender";
-
-class BooleanWrapper : public base::SupportsUserData::Data {
- public:
-  explicit BooleanWrapper(bool b) : m_b(b) { }
-  virtual ~BooleanWrapper() { }
-
-  operator bool() const { return m_b; }
- private:
-  bool m_b;
-  DISALLOW_COPY_AND_ASSIGN(BooleanWrapper);
-};
-
-}  // namespace
-
-PrerenderConditionPlatform::PrerenderConditionPlatform(
-    content::BrowserContext* context)
-    : context_(context) {}
-
-PrerenderConditionPlatform::~PrerenderConditionPlatform() {}
-
-bool PrerenderConditionPlatform::CanPrerender() const {
-  base::SupportsUserData::Data* data = context_->GetUserData(kAllowPrerender);
-  if (!data)
-    return true;
-  BooleanWrapper* b = static_cast<BooleanWrapper*>(data);
-  return *b;
-}
-
-void PrerenderConditionPlatform::SetEnabled(content::BrowserContext* context,
-                                            bool enabled) {
-  BooleanWrapper* wrapper = new BooleanWrapper(enabled);
-  context->SetUserData(kAllowPrerender, wrapper);
-}
-
-}  // namespace android
diff --git a/chrome/browser/android/prerender_condition_platform.h b/chrome/browser/android/prerender_condition_platform.h
deleted file mode 100644
index bd5a9fe..0000000
--- a/chrome/browser/android/prerender_condition_platform.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_ANDROID_PRERENDER_CONDITION_PLATFORM_H_
-#define CHROME_BROWSER_ANDROID_PRERENDER_CONDITION_PLATFORM_H_
-
-#include "base/compiler_specific.h"
-#include "base/supports_user_data.h"
-#include "chrome/browser/prerender/prerender_condition.h"
-
-namespace content {
-class BrowserContext;
-}  // namespace content
-
-namespace android {
-
-class PrerenderConditionPlatform : public prerender::PrerenderCondition {
- public:
-  explicit PrerenderConditionPlatform(content::BrowserContext* context);
-  virtual ~PrerenderConditionPlatform();
-
-  // prerender::PrerenderCondition
-  virtual bool CanPrerender() const OVERRIDE;
-
-  static void SetEnabled(content::BrowserContext* context, bool enabled);
- private:
-  content::BrowserContext* context_;
-  DISALLOW_COPY_AND_ASSIGN(PrerenderConditionPlatform);
-};
-
-}  // namespace android
-
-#endif  // CHROME_BROWSER_ANDROID_PRERENDER_CONDITION_PLATFORM_H_
diff --git a/chrome/browser/chromeos/prerender_condition_network.cc b/chrome/browser/chromeos/prerender_condition_network.cc
deleted file mode 100644
index 9033f80..0000000
--- a/chrome/browser/chromeos/prerender_condition_network.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.
-
-#include "chrome/browser/chromeos/prerender_condition_network.h"
-
-#include "chromeos/network/network_state.h"
-#include "chromeos/network/network_state_handler.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-
-namespace chromeos {
-
-PrerenderConditionNetwork::PrerenderConditionNetwork() {
-}
-
-PrerenderConditionNetwork::~PrerenderConditionNetwork() {
-}
-
-bool PrerenderConditionNetwork::CanPrerender() const {
-  const NetworkState* default_network =
-      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
-  return default_network &&
-         !default_network->Matches(NetworkTypePattern::Mobile());
-}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/prerender_condition_network.h b/chrome/browser/chromeos/prerender_condition_network.h
deleted file mode 100644
index 7422687..0000000
--- a/chrome/browser/chromeos/prerender_condition_network.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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_CHROMEOS_PRERENDER_CONDITION_NETWORK_H_
-#define CHROME_BROWSER_CHROMEOS_PRERENDER_CONDITION_NETWORK_H_
-
-#include "base/compiler_specific.h"
-#include "chrome/browser/prerender/prerender_condition.h"
-
-namespace chromeos {
-
-class PrerenderConditionNetwork : public prerender::PrerenderCondition {
- public:
-  PrerenderConditionNetwork();
-  virtual ~PrerenderConditionNetwork();
-
-  // prerender::PrerenderCondition
-  virtual bool CanPrerender() const OVERRIDE;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_PRERENDER_CONDITION_NETWORK_H_
diff --git a/chrome/browser/prerender/prerender_condition.h b/chrome/browser/prerender/prerender_condition.h
deleted file mode 100644
index ee25414..0000000
--- a/chrome/browser/prerender/prerender_condition.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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_PRERENDER_PRERENDER_CONDITION_H_
-#define CHROME_BROWSER_PRERENDER_PRERENDER_CONDITION_H_
-
-namespace prerender {
-
-// PrerenderCondition's dictate whether prerendering can happen.
-// All conditions must be met before a prerender is allowed.
-class PrerenderCondition {
- public:
-  virtual ~PrerenderCondition() {}
-  virtual bool CanPrerender() const = 0;
-};
-
-}  // namespace prerender
-
-#endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONDITION_H_
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 3627820..0f61a8c 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -15,7 +15,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/timer/elapsed_timer.h"
@@ -27,7 +26,6 @@
 #include "chrome/browser/net/prediction_options.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"
 #include "chrome/browser/prerender/prerender_final_status.h"
@@ -317,7 +315,6 @@ PrerenderManager::~PrerenderManager() {
 
 void PrerenderManager::Shutdown() {
   DestroyAllContents(FINAL_STATUS_MANAGER_SHUTDOWN);
-  STLDeleteElements(&prerender_conditions_);
   on_close_web_contents_deleters_.clear();
   // Must happen before |profile_| is set to NULL as
   // |local_predictor_| accesses it.
@@ -969,10 +966,6 @@ void PrerenderManager::RecordFinalStatusWithMatchCompleteStatus(
                                  final_status);
 }
 
-void PrerenderManager::AddCondition(const PrerenderCondition* condition) {
-  prerender_conditions_.push_back(condition);
-}
-
 void PrerenderManager::RecordNavigation(const GURL& url) {
   DCHECK(CalledOnValidThread());
 
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 35c6a5c..3344c9d 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -65,7 +65,6 @@ class URLRequestContextGetter;
 
 namespace prerender {
 
-class PrerenderCondition;
 class PrerenderHandle;
 class PrerenderHistory;
 class PrerenderLocalPredictor;
@@ -300,9 +299,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   bool cookie_store_loaded() { return cookie_store_loaded_; }
 
-  // Adds a condition. This is owned by the PrerenderManager.
-  void AddCondition(const PrerenderCondition* condition);
-
   // Records that some visible tab navigated (or was redirected) to the
   // provided URL.
   void RecordNavigation(const GURL& url);
@@ -718,8 +714,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   scoped_ptr<PrerenderHistory> prerender_history_;
 
-  std::list<const PrerenderCondition*> prerender_conditions_;
-
   scoped_ptr<PrerenderHistograms> histograms_;
 
   scoped_ptr<PrerenderLocalPredictor> local_predictor_;
diff --git a/chrome/browser/prerender/prerender_manager_factory.cc b/chrome/browser/prerender/prerender_manager_factory.cc
index 2110169..43f4d57 100644
--- a/chrome/browser/prerender/prerender_manager_factory.cc
+++ b/chrome/browser/prerender/prerender_manager_factory.cc
@@ -15,15 +15,6 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/prerender_condition_platform.h"
-#endif
-
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/prerender_condition_network.h"
-#include "chromeos/network/network_handler.h"
-#endif
-
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ -72,14 +63,6 @@ KeyedService* PrerenderManagerFactory::BuildServiceInstanceFor(
 
   PrerenderManager* prerender_manager = new PrerenderManager(
       profile, g_browser_process->prerender_tracker());
-#if defined(OS_CHROMEOS)
-  if (chromeos::NetworkHandler::IsInitialized())
-    prerender_manager->AddCondition(new chromeos::PrerenderConditionNetwork);
-#endif
-#if defined(OS_ANDROID)
-  prerender_manager->AddCondition(new android::PrerenderConditionPlatform(
-      browser_context));
-#endif
   return prerender_manager;
 }
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5ac155f1f..27baf01 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -77,8 +77,6 @@
       'browser/android/password_authentication_manager.h',
       'browser/android/password_ui_view_android.cc',
       'browser/android/password_ui_view_android.h',
-      'browser/android/prerender_condition_platform.cc',
-      'browser/android/prerender_condition_platform.h',
       'browser/android/profiles/profile_downloader_android.cc',
       'browser/android/profiles/profile_downloader_android.h',
       'browser/android/provider/blocking_ui_thread_async_request.cc',
@@ -949,7 +947,6 @@
       'browser/prerender/external_prerender_handler_android.h',
       'browser/prerender/prerender_cookie_store.cc',
       'browser/prerender/prerender_cookie_store.h',
-      'browser/prerender/prerender_condition.h',
       'browser/prerender/prerender_config.cc',
       'browser/prerender/prerender_config.h',
       'browser/prerender/prerender_contents.cc',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 85abff7..b7e75cf 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -908,8 +908,6 @@
         'browser/chromeos/power/session_state_controller_delegate_chromeos.h',
         'browser/chromeos/preferences.cc',
         'browser/chromeos/preferences.h',
-        'browser/chromeos/prerender_condition_network.cc',
-        'browser/chromeos/prerender_condition_network.h',
         'browser/chromeos/profiles/avatar_menu_actions_chromeos.cc',
         'browser/chromeos/profiles/avatar_menu_actions_chromeos.h',
         'browser/chromeos/profiles/avatar_menu_chromeos.cc',