| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "base/threading/sequenced_worker_pool.h" | 11 #include "base/threading/sequenced_worker_pool.h" |
| 12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 13 #include "content/browser/dom_storage/dom_storage_area.h" | 13 #include "content/browser/dom_storage/dom_storage_area.h" |
| 14 #include "content/browser/dom_storage/dom_storage_context_impl.h" | 14 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
| 15 #include "content/browser/dom_storage/dom_storage_namespace.h" | 15 #include "content/browser/dom_storage/dom_storage_namespace.h" |
| 16 #include "content/browser/dom_storage/dom_storage_task_runner.h" | 16 #include "content/browser/dom_storage/dom_storage_task_runner.h" |
| 17 #include "content/public/browser/local_storage_usage_info.h" | 17 #include "content/public/browser/local_storage_usage_info.h" |
| 18 #include "content/public/browser/session_storage_namespace.h" | 18 #include "content/public/browser/session_storage_namespace.h" |
| 19 #include "content/public/browser/session_storage_usage_info.h" | 19 #include "content/public/browser/session_storage_usage_info.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 21 #include "webkit/browser/quota/mock_special_storage_policy.h" | 21 #include "webkit/browser/quota/mock_special_storage_policy.h" |
| 22 | 22 |
| 23 using base::ASCIIToUTF16; |
| 24 |
| 23 namespace content { | 25 namespace content { |
| 24 | 26 |
| 25 class DOMStorageContextImplTest : public testing::Test { | 27 class DOMStorageContextImplTest : public testing::Test { |
| 26 public: | 28 public: |
| 27 DOMStorageContextImplTest() | 29 DOMStorageContextImplTest() |
| 28 : kOrigin(GURL("http://dom_storage/")), | 30 : kOrigin(GURL("http://dom_storage/")), |
| 29 kKey(ASCIIToUTF16("key")), | 31 kKey(ASCIIToUTF16("key")), |
| 30 kValue(ASCIIToUTF16("value")), | 32 kValue(ASCIIToUTF16("value")), |
| 31 kDontIncludeFileInfo(false), | 33 kDontIncludeFileInfo(false), |
| 32 kDoIncludeFileInfo(true) { | 34 kDoIncludeFileInfo(true) { |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 // Verify that the merge was successful. | 368 // Verify that the merge was successful. |
| 367 ASSERT_TRUE(alias_ns->alias_master_namespace() == target_ns); | 369 ASSERT_TRUE(alias_ns->alias_master_namespace() == target_ns); |
| 368 base::NullableString16 read_value = target_ns_area->GetItem(kKey); | 370 base::NullableString16 read_value = target_ns_area->GetItem(kKey); |
| 369 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kValue2); | 371 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kValue2); |
| 370 DOMStorageArea* alias_ns_area = alias_ns->OpenStorageArea(kOrigin); | 372 DOMStorageArea* alias_ns_area = alias_ns->OpenStorageArea(kOrigin); |
| 371 read_value = alias_ns_area->GetItem(kKey2); | 373 read_value = alias_ns_area->GetItem(kKey2); |
| 372 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kKey2Value); | 374 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kKey2Value); |
| 373 } | 375 } |
| 374 | 376 |
| 375 } // namespace content | 377 } // namespace content |
| OLD | NEW |