Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: content/renderer/renderer_main.cc

Issue 140763008: Add a UMA stat to track if the Browser blacklist is Set on the Renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add to test Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/debugger.h" 7 #include "base/debug/debugger.h"
8 #include "base/debug/stack_trace.h" 8 #include "base/debug/stack_trace.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 30 matching lines...) Expand all
41 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
42 #include <Carbon/Carbon.h> 42 #include <Carbon/Carbon.h>
43 #include <signal.h> 43 #include <signal.h>
44 #include <unistd.h> 44 #include <unistd.h>
45 45
46 #include "base/mac/mac_util.h" 46 #include "base/mac/mac_util.h"
47 #include "base/mac/scoped_nsautorelease_pool.h" 47 #include "base/mac/scoped_nsautorelease_pool.h"
48 #include "third_party/WebKit/public/web/WebView.h" 48 #include "third_party/WebKit/public/web/WebView.h"
49 #endif // OS_MACOSX 49 #endif // OS_MACOSX
50 50
51 #if defined(OS_WIN)
52 #include "chrome_elf/blacklist/blacklist.h"
53 #endif // OS_WIN
54
51 #if defined(ENABLE_WEBRTC) 55 #if defined(ENABLE_WEBRTC)
52 #include "third_party/libjingle/overrides/init_webrtc.h" 56 #include "third_party/libjingle/overrides/init_webrtc.h"
53 #endif 57 #endif
54 58
55 namespace content { 59 namespace content {
56 namespace { 60 namespace {
57 // This function provides some ways to test crash and assertion handling 61 // This function provides some ways to test crash and assertion handling
58 // behavior of the renderer. 62 // behavior of the renderer.
59 static void HandleRendererErrorTestParameters(const CommandLine& command_line) { 63 static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
60 if (command_line.HasSwitch(switches::kWaitForDebugger)) 64 if (command_line.HasSwitch(switches::kWaitForDebugger))
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 234 }
231 #if defined(OS_POSIX) && !defined(OS_MACOSX) 235 #if defined(OS_POSIX) && !defined(OS_MACOSX)
232 RenderProcessImpl render_process; 236 RenderProcessImpl render_process;
233 new RenderThreadImpl(); 237 new RenderThreadImpl();
234 #endif 238 #endif
235 239
236 base::HighResolutionTimerManager hi_res_timer_manager; 240 base::HighResolutionTimerManager hi_res_timer_manager;
237 241
238 platform.RunSandboxTests(no_sandbox); 242 platform.RunSandboxTests(no_sandbox);
239 243
244 #if defined(OS_WIN)
245 // TODO(csharp): Remove once the renderer is no longer getting
246 // patched this way.
247 if (blacklist::IsBlacklistInitialized())
248 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
Alexei Svitkine (slow) 2014/02/06 22:12:29 I would actually suggest: UMA_HISTOGRAM_BOOLEAN("
csharp 2014/02/06 22:21:59 We just want the raw numbers since ideally this sh
249 #endif
250
240 startup_timer.Stop(); // End of Startup Time Measurement. 251 startup_timer.Stop(); // End of Startup Time Measurement.
241 252
242 if (run_loop) { 253 if (run_loop) {
243 #if defined(OS_MACOSX) 254 #if defined(OS_MACOSX)
244 if (pool) 255 if (pool)
245 pool->Recycle(); 256 pool->Recycle();
246 #endif 257 #endif
247 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0); 258 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
248 base::MessageLoop::current()->Run(); 259 base::MessageLoop::current()->Run();
249 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 260 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
250 } 261 }
251 } 262 }
252 platform.PlatformUninitialize(); 263 platform.PlatformUninitialize();
253 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 264 TRACE_EVENT_END_ETW("RendererMain", 0, "");
254 return 0; 265 return 0;
255 } 266 }
256 267
257 } // namespace content 268 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698