summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/metrics/metrics_log.cc11
-rw-r--r--chrome/browser/metrics/metrics_service.cc20
-rw-r--r--chrome/browser/metrics/metrics_service.h4
-rw-r--r--chrome/browser/sandbox_policy.cc8
-rw-r--r--chrome/common/notification_type.h6
-rw-r--r--chrome/common/pref_names.cc10
-rw-r--r--chrome/common/pref_names.h3
7 files changed, 0 insertions, 62 deletions
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index cef0a76..025fea8 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -502,17 +502,6 @@ void MetricsLog::RecordEnvironment(
}
{
- OPEN_ELEMENT_FOR_SCOPE("security");
- WriteIntAttribute("rendereronsboxdesktop",
- pref->GetInteger(prefs::kSecurityRendererOnSboxDesktop));
- pref->SetInteger(prefs::kSecurityRendererOnSboxDesktop, 0);
-
- WriteIntAttribute("rendererondefaultdesktop",
- pref->GetInteger(prefs::kSecurityRendererOnDefaultDesktop));
- pref->SetInteger(prefs::kSecurityRendererOnDefaultDesktop, 0);
- }
-
- {
OPEN_ELEMENT_FOR_SCOPE("memory");
WriteIntAttribute("mb", base::SysInfo::AmountOfPhysicalMemoryMB());
#if defined(OS_WIN)
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 61def28..a16ced2 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -326,8 +326,6 @@ void MetricsService::RegisterPrefs(PrefService* local_state) {
local_state->RegisterIntegerPref(prefs::kStabilityIncompleteSessionEndCount,
0);
local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0);
- local_state->RegisterIntegerPref(prefs::kSecurityRendererOnSboxDesktop, 0);
- local_state->RegisterIntegerPref(prefs::kSecurityRendererOnDefaultDesktop, 0);
local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
local_state->RegisterIntegerPref(prefs::kStabilityRendererHangCount, 0);
local_state->RegisterIntegerPref(prefs::kStabilityBreakpadRegistrationFail,
@@ -373,9 +371,6 @@ void MetricsService::DiscardOldStabilityStats(PrefService* local_state) {
local_state->SetInteger(prefs::kStabilityRendererCrashCount, 0);
local_state->SetInteger(prefs::kStabilityRendererHangCount, 0);
- local_state->SetInteger(prefs::kSecurityRendererOnSboxDesktop, 0);
- local_state->SetInteger(prefs::kSecurityRendererOnDefaultDesktop, 0);
-
local_state->SetString(prefs::kStabilityLaunchTimeSec, L"0");
local_state->SetString(prefs::kStabilityLastTimestampSec, L"0");
local_state->SetString(prefs::kStabilityUptimeSec, L"0");
@@ -482,8 +477,6 @@ void MetricsService::SetRecording(bool enabled) {
NotificationService::AllSources());
registrar_.Add(this, NotificationType::LOAD_STOP,
NotificationService::AllSources());
- registrar_.Add(this, NotificationType::RENDERER_PROCESS_IN_SBOX,
- NotificationService::AllSources());
registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
NotificationService::AllSources());
registrar_.Add(this, NotificationType::RENDERER_PROCESS_HANG,
@@ -569,10 +562,6 @@ void MetricsService::Observe(NotificationType type,
LogRendererHang();
break;
- case NotificationType::RENDERER_PROCESS_IN_SBOX:
- LogRendererInSandbox(*Details<bool>(details).ptr());
- break;
-
case NotificationType::CHILD_PROCESS_HOST_CONNECTED:
case NotificationType::CHILD_PROCESS_CRASHED:
case NotificationType::CHILD_INSTANCE_CREATED:
@@ -1668,15 +1657,6 @@ void MetricsService::LogLoadStarted() {
// might be lost due to a crash :-(.
}
-void MetricsService::LogRendererInSandbox(bool on_sandbox_desktop) {
- PrefService* prefs = g_browser_process->local_state();
- DCHECK(prefs);
- if (on_sandbox_desktop)
- IncrementPrefValue(prefs::kSecurityRendererOnSboxDesktop);
- else
- IncrementPrefValue(prefs::kSecurityRendererOnDefaultDesktop);
-}
-
void MetricsService::LogRendererCrash() {
IncrementPrefValue(prefs::kStabilityRendererCrashCount);
}
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 7bf4911..49827ac 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -331,10 +331,6 @@ class MetricsService : public NotificationObserver,
// Records a renderer process hang.
void LogRendererHang();
- // Records the desktop security status of a renderer in the sandbox at
- // creation time.
- void LogRendererInSandbox(bool on_sandbox_desktop);
-
// Set the value in preferences for the number of bookmarks and folders
// in node. The pref key for the number of bookmarks in num_bookmarks_key and
// the pref key for number of folders in num_folders_key.
diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc
index 62d6af2..9b53eed 100644
--- a/chrome/browser/sandbox_policy.cc
+++ b/chrome/browser/sandbox_policy.cc
@@ -20,7 +20,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/debug_flags.h"
-#include "chrome/common/notification_service.h"
#include "sandbox/src/sandbox.h"
#include "webkit/glue/plugins/plugin_list.h"
@@ -426,13 +425,6 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
if (sandbox::SBOX_ALL_OK != result)
return 0;
- if (type == ChildProcessInfo::RENDER_PROCESS) {
- NotificationService::current()->Notify(
- NotificationType::RENDERER_PROCESS_IN_SBOX,
- NotificationService::AllSources(),
- Details<bool>(&on_sandbox_desktop));
- }
-
ResumeThread(target.hThread);
CloseHandle(target.hThread);
process = target.hProcess;
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 3a98af6..02514f8 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -362,12 +362,6 @@ class NotificationType {
// hung view, and no details are expected.
RENDERER_PROCESS_HANG,
- // Indicates that a render process is created in the sandbox. The source
- // will be the RenderProcessHost that corresponds to the created process
- // and the detail is a bool telling us if the process got created on the
- // sandbox desktop or not.
- RENDERER_PROCESS_IN_SBOX,
-
// This is sent to notify that the RenderViewHost displayed in a
// TabContents has changed. Source is the TabContents for which the change
// happened, details is the previous RenderViewHost (can be NULL when the
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 27e4407..f417d63 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -366,16 +366,6 @@ const wchar_t kStabilityPageLoadCount[] =
const wchar_t kStabilityRendererCrashCount[] =
L"user_experience_metrics.stability.renderer_crash_count";
-// Number of times a renderer started in the sandbox and successfully
-// used the sandbox desktop.
-const wchar_t kSecurityRendererOnSboxDesktop[] =
- L"user_experience_metrics.security.renderer_on_sbox_desktop";
-
-// Number of times a renderer started in the sandbox and failed to
-// used the sandbox desktop.
-const wchar_t kSecurityRendererOnDefaultDesktop[] =
- L"user_experience_metrics.security.renderer_on_default_desktop";
-
// Time when the app was last launched, in seconds since the epoch.
const wchar_t kStabilityLaunchTimeSec[] =
L"user_experience_metrics.stability.launch_time_sec";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 60b6ef8..6ea8293 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -146,9 +146,6 @@ extern const wchar_t kStabilityBreakpadRegistrationFail[];
extern const wchar_t kStabilityDebuggerPresent[];
extern const wchar_t kStabilityDebuggerNotPresent[];
-extern const wchar_t kSecurityRendererOnSboxDesktop[];
-extern const wchar_t kSecurityRendererOnDefaultDesktop[];
-
extern const wchar_t kStabilityPluginStats[];
extern const wchar_t kStabilityPluginName[];
extern const wchar_t kStabilityPluginLaunches[];
generated by cgit v1.1 at 2025-02-02 22:39:01 +0000