| OLD | NEW |
| 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 "chrome/common/child_process_logging.h" | 5 #include "chrome/common/child_process_logging.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "base/string_split.h" | 11 #include "base/string_split.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
| 14 #include "base/sys_string_conversions.h" | 14 #include "base/sys_string_conversions.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "chrome/common/metrics/experiments_helper.h" | 16 #include "chrome/common/metrics/variations_util.h" |
| 17 #include "chrome/installer/util/google_update_settings.h" | 17 #include "chrome/installer/util/google_update_settings.h" |
| 18 #include "content/public/common/gpu_info.h" | 18 #include "content/public/common/gpu_info.h" |
| 19 #include "googleurl/src/gurl.h" | 19 #include "googleurl/src/gurl.h" |
| 20 | 20 |
| 21 namespace child_process_logging { | 21 namespace child_process_logging { |
| 22 | 22 |
| 23 using base::mac::SetCrashKeyValueFuncPtr; | 23 using base::mac::SetCrashKeyValueFuncPtr; |
| 24 using base::mac::ClearCrashKeyValueFuncPtr; | 24 using base::mac::ClearCrashKeyValueFuncPtr; |
| 25 using base::mac::SetCrashKeyValue; | 25 using base::mac::SetCrashKeyValue; |
| 26 using base::mac::ClearCrashKey; | 26 using base::mac::ClearCrashKey; |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 ClearCrashKey(key); | 220 ClearCrashKey(key); |
| 221 } | 221 } |
| 222 } | 222 } |
| 223 | 223 |
| 224 void SetExperimentList(const std::vector<string16>& experiments) { | 224 void SetExperimentList(const std::vector<string16>& experiments) { |
| 225 // These should match the corresponding strings in breakpad_win.cc. | 225 // These should match the corresponding strings in breakpad_win.cc. |
| 226 NSString* const kNumExperimentsKey = @"num-experiments"; | 226 NSString* const kNumExperimentsKey = @"num-experiments"; |
| 227 NSString* const kExperimentChunkFormat = @"experiment-chunk-%zu"; // 1-based. | 227 NSString* const kExperimentChunkFormat = @"experiment-chunk-%zu"; // 1-based. |
| 228 | 228 |
| 229 std::vector<string16> chunks; | 229 std::vector<string16> chunks; |
| 230 experiments_helper::GenerateExperimentChunks(experiments, &chunks); | 230 chrome_variations::GenerateVariationChunks(experiments, &chunks); |
| 231 | 231 |
| 232 // Store up to |kMaxReportedExperimentChunks| chunks. | 232 // Store up to |kMaxReportedVariationChunks| chunks. |
| 233 for (size_t i = 0; i < kMaxReportedExperimentChunks; ++i) { | 233 for (size_t i = 0; i < kMaxReportedVariationChunks; ++i) { |
| 234 NSString* key = [NSString stringWithFormat:kExperimentChunkFormat, i + 1]; | 234 NSString* key = [NSString stringWithFormat:kExperimentChunkFormat, i + 1]; |
| 235 if (i < chunks.size()) { | 235 if (i < chunks.size()) { |
| 236 NSString* value = base::SysUTF16ToNSString(chunks[i]); | 236 NSString* value = base::SysUTF16ToNSString(chunks[i]); |
| 237 SetCrashKeyValue(key, value); | 237 SetCrashKeyValue(key, value); |
| 238 } else { | 238 } else { |
| 239 ClearCrashKey(key); | 239 ClearCrashKey(key); |
| 240 } | 240 } |
| 241 } | 241 } |
| 242 | 242 |
| 243 // Make note of the total number of experiments, which may be greater than | 243 // Make note of the total number of experiments, which may be greater than |
| 244 // what was able to fit in |kMaxReportedExperimentChunks|. This is useful | 244 // what was able to fit in |kMaxReportedVariationChunks|. This is useful when |
| 245 // when correlating stability with the number of experiments running | 245 // correlating stability with the number of experiments running |
| 246 // simultaneously. | 246 // simultaneously. |
| 247 SetCrashKeyValue(kNumExperimentsKey, | 247 SetCrashKeyValue(kNumExperimentsKey, |
| 248 [NSString stringWithFormat:@"%zu", experiments.size()]); | 248 [NSString stringWithFormat:@"%zu", experiments.size()]); |
| 249 } | 249 } |
| 250 | 250 |
| 251 void SetChannel(const std::string& channel) { | 251 void SetChannel(const std::string& channel) { |
| 252 // This should match the corresponding string in breakpad_win.cc. | 252 // This should match the corresponding string in breakpad_win.cc. |
| 253 NSString* const kChannelKey = @"channel"; | 253 NSString* const kChannelKey = @"channel"; |
| 254 | 254 |
| 255 SetCrashKeyValue(kChannelKey, base::SysUTF8ToNSString(channel)); | 255 SetCrashKeyValue(kChannelKey, base::SysUTF8ToNSString(channel)); |
| 256 } | 256 } |
| 257 | 257 |
| 258 } // namespace child_process_logging | 258 } // namespace child_process_logging |
| OLD | NEW |