| Index: chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| index d6e478b3cd65e1dca493d60d77d14f11b628d692..35534c2a28ef2b1bfb7b5b652b763764ec2e22ca 100644
|
| --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| @@ -194,11 +194,11 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| query.ColumnString(3));
|
|
|
| if (query.ColumnType(4) != sql::COLUMN_TYPE_NULL) {
|
| - scoped_ptr<Value> parsed_value(
|
| + scoped_ptr<base::Value> parsed_value(
|
| base::JSONReader::Read(query.ColumnString(4)));
|
| - if (parsed_value && parsed_value->IsType(Value::TYPE_LIST)) {
|
| - action->set_args(
|
| - make_scoped_ptr(static_cast<ListValue*>(parsed_value.release())));
|
| + if (parsed_value && parsed_value->IsType(base::Value::TYPE_LIST)) {
|
| + action->set_args(make_scoped_ptr(
|
| + static_cast<base::ListValue*>(parsed_value.release())));
|
| }
|
| }
|
|
|
| @@ -207,11 +207,11 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| action->ParseArgUrl(query.ColumnString(7));
|
|
|
| if (query.ColumnType(8) != sql::COLUMN_TYPE_NULL) {
|
| - scoped_ptr<Value> parsed_value(
|
| + scoped_ptr<base::Value> parsed_value(
|
| base::JSONReader::Read(query.ColumnString(8)));
|
| - if (parsed_value && parsed_value->IsType(Value::TYPE_DICTIONARY)) {
|
| + if (parsed_value && parsed_value->IsType(base::Value::TYPE_DICTIONARY)) {
|
| action->set_other(make_scoped_ptr(
|
| - static_cast<DictionaryValue*>(parsed_value.release())));
|
| + static_cast<base::DictionaryValue*>(parsed_value.release())));
|
| }
|
| }
|
| actions->push_back(action);
|
|
|