| Index: chrome/browser/component_updater/component_updater_service.cc
|
| diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
|
| index 6e2d98d195fe1790910da9bacdc1611cfa981486..699dbc506f6fa5d06050bbb4f7a15f8dad02dcfa 100644
|
| --- a/chrome/browser/component_updater/component_updater_service.cc
|
| +++ b/chrome/browser/component_updater/component_updater_service.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| +#include "base/string_piece.h"
|
| #include "base/string_util.h"
|
| #include "base/stringprintf.h"
|
| #include "base/timer.h"
|
| @@ -74,10 +75,13 @@ static std::string HexStringToID(const std::string& hexstr) {
|
| std::string id;
|
| for (size_t i = 0; i < hexstr.size(); ++i) {
|
| int val;
|
| - if (base::HexStringToInt(hexstr.begin() + i, hexstr.begin() + i + 1, &val))
|
| + if (base::HexStringToInt(base::StringPiece(hexstr.begin() + i,
|
| + hexstr.begin() + i + 1),
|
| + &val)) {
|
| id.append(1, val + 'a');
|
| - else
|
| + } else {
|
| id.append(1, 'a');
|
| + }
|
| }
|
| DCHECK(Extension::IdIsValid(id));
|
| return id;
|
|
|