| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/browser/value_store/value_store_unittest.h" | 5 #include "extensions/browser/value_store/value_store_unittest.h" |
| 6 | 6 |
| 7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
| 8 #include "base/memory/linked_ptr.h" | 8 #include "base/memory/linked_ptr.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 | 10 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 : key1_("foo"), | 128 : key1_("foo"), |
| 129 key2_("bar"), | 129 key2_("bar"), |
| 130 key3_("baz"), | 130 key3_("baz"), |
| 131 empty_dict_(new base::DictionaryValue()), | 131 empty_dict_(new base::DictionaryValue()), |
| 132 dict1_(new base::DictionaryValue()), | 132 dict1_(new base::DictionaryValue()), |
| 133 dict3_(new base::DictionaryValue()), | 133 dict3_(new base::DictionaryValue()), |
| 134 dict12_(new base::DictionaryValue()), | 134 dict12_(new base::DictionaryValue()), |
| 135 dict123_(new base::DictionaryValue()), | 135 dict123_(new base::DictionaryValue()), |
| 136 ui_thread_(BrowserThread::UI, base::MessageLoop::current()), | 136 ui_thread_(BrowserThread::UI, base::MessageLoop::current()), |
| 137 file_thread_(BrowserThread::FILE, base::MessageLoop::current()) { | 137 file_thread_(BrowserThread::FILE, base::MessageLoop::current()) { |
| 138 val1_.reset(base::Value::CreateStringValue(key1_ + "Value")); | 138 val1_.reset(new base::StringValue(key1_ + "Value")); |
| 139 val2_.reset(base::Value::CreateStringValue(key2_ + "Value")); | 139 val2_.reset(new base::StringValue(key2_ + "Value")); |
| 140 val3_.reset(base::Value::CreateStringValue(key3_ + "Value")); | 140 val3_.reset(new base::StringValue(key3_ + "Value")); |
| 141 | 141 |
| 142 list1_.push_back(key1_); | 142 list1_.push_back(key1_); |
| 143 list2_.push_back(key2_); | 143 list2_.push_back(key2_); |
| 144 list3_.push_back(key3_); | 144 list3_.push_back(key3_); |
| 145 list12_.push_back(key1_); | 145 list12_.push_back(key1_); |
| 146 list12_.push_back(key2_); | 146 list12_.push_back(key2_); |
| 147 list13_.push_back(key1_); | 147 list13_.push_back(key1_); |
| 148 list13_.push_back(key3_); | 148 list13_.push_back(key3_); |
| 149 list123_.push_back(key1_); | 149 list123_.push_back(key1_); |
| 150 list123_.push_back(key2_); | 150 list123_.push_back(key2_); |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 } | 472 } |
| 473 { | 473 { |
| 474 ValueStoreChangeList changes; | 474 ValueStoreChangeList changes; |
| 475 changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), NULL)); | 475 changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), NULL)); |
| 476 changes.push_back( | 476 changes.push_back( |
| 477 ValueStoreChange("qwerty", val3_->DeepCopy(), NULL)); | 477 ValueStoreChange("qwerty", val3_->DeepCopy(), NULL)); |
| 478 EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear()); | 478 EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear()); |
| 479 EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear()); | 479 EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear()); |
| 480 } | 480 } |
| 481 } | 481 } |
| OLD | NEW |