| Index: chrome/browser/performance_monitor/database.cc
|
| diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc
|
| index 4d34ef28057f5bdcdb6987e3ef77302dabe2a8dc..bd2f432c38cd6d7057de57705798dd9f9d9d9d8b 100644
|
| --- a/chrome/browser/performance_monitor/database.cc
|
| +++ b/chrome/browser/performance_monitor/database.cc
|
| @@ -57,12 +57,12 @@ double StringToDouble(const std::string& s) {
|
| // Returns an event from the given JSON string; the scoped_ptr will be NULL if
|
| // we are unable to properly parse the JSON.
|
| scoped_ptr<Event> EventFromJSON(const std::string& data) {
|
| - Value* value = base::JSONReader::Read(data);
|
| - DictionaryValue* dict = NULL;
|
| + base::Value* value = base::JSONReader::Read(data);
|
| + base::DictionaryValue* dict = NULL;
|
| if (!value || !value->GetAsDictionary(&dict))
|
| return scoped_ptr<Event>();
|
|
|
| - return Event::FromValue(scoped_ptr<DictionaryValue>(dict));
|
| + return Event::FromValue(scoped_ptr<base::DictionaryValue>(dict));
|
| }
|
|
|
| } // namespace
|
|
|