| 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 d63f08bc2111c64fc98c011ac8ef9e249d4b8712..f00997b5953d33e9a0590d36d296f89e1b5f6ab9 100644
|
| --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/json/json_string_value_serializer.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
|
| @@ -121,7 +122,7 @@ bool FullStreamUIPolicy::FlushDatabase(sql::Connection* db) {
|
| return true;
|
| }
|
|
|
| -scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| +std::unique_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| const std::string& extension_id,
|
| const Action::ActionType type,
|
| const std::string& api_name,
|
| @@ -131,7 +132,7 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| // Ensure data is flushed to the database first so that we query over all
|
| // data.
|
| activity_database()->AdviseFlush(ActivityDatabase::kFlushImmediately);
|
| - scoped_ptr<Action::ActionVector> actions(new Action::ActionVector());
|
| + std::unique_ptr<Action::ActionVector> actions(new Action::ActionVector());
|
|
|
| sql::Connection* db = GetDatabaseConnection();
|
| if (!db) {
|
| @@ -197,10 +198,10 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| query.ColumnString(3), query.ColumnInt64(9));
|
|
|
| if (query.ColumnType(4) != sql::COLUMN_TYPE_NULL) {
|
| - scoped_ptr<base::Value> parsed_value =
|
| + std::unique_ptr<base::Value> parsed_value =
|
| base::JSONReader::Read(query.ColumnString(4));
|
| if (parsed_value && parsed_value->IsType(base::Value::TYPE_LIST)) {
|
| - action->set_args(make_scoped_ptr(
|
| + action->set_args(base::WrapUnique(
|
| static_cast<base::ListValue*>(parsed_value.release())));
|
| }
|
| }
|
| @@ -210,10 +211,10 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData(
|
| action->ParseArgUrl(query.ColumnString(7));
|
|
|
| if (query.ColumnType(8) != sql::COLUMN_TYPE_NULL) {
|
| - scoped_ptr<base::Value> parsed_value =
|
| + std::unique_ptr<base::Value> parsed_value =
|
| base::JSONReader::Read(query.ColumnString(8));
|
| if (parsed_value && parsed_value->IsType(base::Value::TYPE_DICTIONARY)) {
|
| - action->set_other(make_scoped_ptr(
|
| + action->set_other(base::WrapUnique(
|
| static_cast<base::DictionaryValue*>(parsed_value.release())));
|
| }
|
| }
|
| @@ -398,8 +399,8 @@ void FullStreamUIPolicy::ReadFilteredData(
|
| const std::string& page_url,
|
| const std::string& arg_url,
|
| const int days_ago,
|
| - const base::Callback
|
| - <void(scoped_ptr<Action::ActionVector>)>& callback) {
|
| + const base::Callback<void(std::unique_ptr<Action::ActionVector>)>&
|
| + callback) {
|
| BrowserThread::PostTaskAndReplyWithResult(
|
| BrowserThread::DB,
|
| FROM_HERE,
|
|
|