| Index: chrome/browser/download/download_query_unittest.cc
|
| diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc
|
| index b1c4d58328751516bc46aeebe6021c9638bdc9a0..974c0b081c58be03693b63986024d0333ab8d91c 100644
|
| --- a/chrome/browser/download/download_query_unittest.cc
|
| +++ b/chrome/browser/download/download_query_unittest.cc
|
| @@ -100,32 +100,32 @@ class DownloadQueryTest : public testing::Test {
|
|
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, bool cpp_value) {
|
| - scoped_ptr<base::Value> value(Value::CreateBooleanValue(cpp_value));
|
| + scoped_ptr<base::Value> value(base::Value::CreateBooleanValue(cpp_value));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
|
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, int cpp_value) {
|
| - scoped_ptr<base::Value> value(Value::CreateIntegerValue(cpp_value));
|
| + scoped_ptr<base::Value> value(base::Value::CreateIntegerValue(cpp_value));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
|
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, const char* cpp_value) {
|
| - scoped_ptr<base::Value> value(Value::CreateStringValue(cpp_value));
|
| + scoped_ptr<base::Value> value(base::Value::CreateStringValue(cpp_value));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
|
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, std::string cpp_value) {
|
| - scoped_ptr<base::Value> value(Value::CreateStringValue(cpp_value));
|
| + scoped_ptr<base::Value> value(base::Value::CreateStringValue(cpp_value));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
|
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, const char16* cpp_value) {
|
| scoped_ptr<base::Value> value(
|
| - Value::CreateStringValue(base::string16(cpp_value)));
|
| + base::Value::CreateStringValue(base::string16(cpp_value)));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
|
|
| @@ -134,7 +134,7 @@ template<> void DownloadQueryTest::AddFilter(
|
| scoped_ptr<base::ListValue> list(new base::ListValue());
|
| for (std::vector<base::string16>::const_iterator it = cpp_value.begin();
|
| it != cpp_value.end(); ++it) {
|
| - list->Append(Value::CreateStringValue(*it));
|
| + list->Append(base::Value::CreateStringValue(*it));
|
| }
|
| CHECK(query_.AddFilter(name, *list.get()));
|
| }
|
| @@ -144,7 +144,7 @@ template<> void DownloadQueryTest::AddFilter(
|
| scoped_ptr<base::ListValue> list(new base::ListValue());
|
| for (std::vector<std::string>::const_iterator it = cpp_value.begin();
|
| it != cpp_value.end(); ++it) {
|
| - list->Append(Value::CreateStringValue(*it));
|
| + list->Append(base::Value::CreateStringValue(*it));
|
| }
|
| CHECK(query_.AddFilter(name, *list.get()));
|
| }
|
| @@ -152,7 +152,7 @@ template<> void DownloadQueryTest::AddFilter(
|
| #if defined(OS_WIN)
|
| template<> void DownloadQueryTest::AddFilter(
|
| DownloadQuery::FilterType name, std::wstring cpp_value) {
|
| - scoped_ptr<base::Value> value(Value::CreateStringValue(cpp_value));
|
| + scoped_ptr<base::Value> value(base::Value::CreateStringValue(cpp_value));
|
| CHECK(query_.AddFilter(name, *value.get()));
|
| }
|
| #endif
|
| @@ -163,7 +163,7 @@ TEST_F(DownloadQueryTest, DownloadQueryTest_ZeroItems) {
|
| }
|
|
|
| TEST_F(DownloadQueryTest, DownloadQueryTest_InvalidFilter) {
|
| - scoped_ptr<base::Value> value(Value::CreateIntegerValue(0));
|
| + scoped_ptr<base::Value> value(base::Value::CreateIntegerValue(0));
|
| EXPECT_FALSE(query()->AddFilter(
|
| static_cast<DownloadQuery::FilterType>(kint32max),
|
| *value.get()));
|
|
|