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

Side by Side Diff: chrome/common/terminate_on_heap_corruption_experiment_win.cc

Issue 468303003: Return string literals as const wchar_t*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/common/terminate_on_heap_corruption_experiment_win.h" 5 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/win/registry.h" 9 #include "base/win/registry.h"
10 #include "chrome/common/chrome_constants.h" 10 #include "chrome/common/chrome_constants.h"
11 #include "chrome/common/chrome_version_info.h" 11 #include "chrome/common/chrome_version_info.h"
12 12
13 #if defined(OS_WIN) 13 #if defined(OS_WIN)
14 #if defined(GOOGLE_CHROME_BUILD) 14 #if defined(GOOGLE_CHROME_BUILD)
15 #define PRODUCT_STRING_PATH L"Google\\Chrome" 15 #define PRODUCT_STRING_PATH L"Google\\Chrome"
16 #elif defined(CHROMIUM_BUILD) 16 #elif defined(CHROMIUM_BUILD)
17 #define PRODUCT_STRING_PATH L"Chromium" 17 #define PRODUCT_STRING_PATH L"Chromium"
18 #else 18 #else
19 #error Unknown branding 19 #error Unknown branding
20 #endif 20 #endif
21 #endif // defined(OS_WIN) 21 #endif // defined(OS_WIN)
22 22
23 namespace { 23 namespace {
24 24
25 wchar_t* GetBeaconKeyPath() { 25 const wchar_t* GetBeaconKeyPath() {
26 chrome::VersionInfo::Channel channel = chrome::VersionInfo::CHANNEL_UNKNOWN; 26 chrome::VersionInfo::Channel channel = chrome::VersionInfo::CHANNEL_UNKNOWN;
27 27
28 // We are called quite early, before the CommandLine is initialized. We don't 28 // We are called quite early, before the CommandLine is initialized. We don't
29 // want to permanently initialize it because ContentMainRunner::Initialize 29 // want to permanently initialize it because ContentMainRunner::Initialize
30 // sets some locale-related stuff to make sure it is parsed properly. But we 30 // sets some locale-related stuff to make sure it is parsed properly. But we
31 // can temporarily initialize it for the purpose of determining if we are 31 // can temporarily initialize it for the purpose of determining if we are
32 // Canary. 32 // Canary.
33 if (!CommandLine::InitializedForCurrentProcess()) { 33 if (!CommandLine::InitializedForCurrentProcess()) {
34 CommandLine::Init(0, NULL); 34 CommandLine::Init(0, NULL);
35 channel = chrome::VersionInfo::GetChannel(); 35 channel = chrome::VersionInfo::GetChannel();
(...skipping 21 matching lines...) Expand all
57 void InitializeDisableTerminateOnHeapCorruptionExperiment() { 57 void InitializeDisableTerminateOnHeapCorruptionExperiment() {
58 base::win::RegKey regkey(HKEY_CURRENT_USER); 58 base::win::RegKey regkey(HKEY_CURRENT_USER);
59 59
60 if (base::FieldTrialList::FindFullName("TerminateOnProcessHeapCorruption") == 60 if (base::FieldTrialList::FindFullName("TerminateOnProcessHeapCorruption") ==
61 "Disabled") { 61 "Disabled") {
62 regkey.CreateKey(GetBeaconKeyPath(), KEY_SET_VALUE); 62 regkey.CreateKey(GetBeaconKeyPath(), KEY_SET_VALUE);
63 } else { 63 } else {
64 regkey.DeleteKey(GetBeaconKeyPath()); 64 regkey.DeleteKey(GetBeaconKeyPath());
65 } 65 }
66 } 66 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698