| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/test/base/in_process_browser_test.h" | 7 #include "chrome/test/base/in_process_browser_test.h" |
| 8 #include "chrome/test/base/ui_test_utils.h" | 8 #include "chrome/test/base/ui_test_utils.h" |
| 9 #include "content/browser/utility_process_host_impl.h" | 9 #include "content/browser/utility_process_host_impl.h" |
| 10 #include "content/public/browser/utility_process_host_client.h" | 10 #include "content/public/browser/utility_process_host_client.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 } | 231 } |
| 232 | 232 |
| 233 void OnInjectIDBKeyFinished(const content::SerializedScriptValue& new_value) { | 233 void OnInjectIDBKeyFinished(const content::SerializedScriptValue& new_value) { |
| 234 EXPECT_EQ(expected_value_.data(), new_value.data()); | 234 EXPECT_EQ(expected_value_.data(), new_value.data()); |
| 235 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 235 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 236 MessageLoop::QuitClosure()); | 236 MessageLoop::QuitClosure()); |
| 237 } | 237 } |
| 238 | 238 |
| 239 | 239 |
| 240 private: | 240 private: |
| 241 virtual ~IDBKeyPathHelper() {} |
| 242 |
| 241 int expected_id_; | 243 int expected_id_; |
| 242 std::vector<IndexedDBKey> expected_keys_; | 244 std::vector<IndexedDBKey> expected_keys_; |
| 243 base::WeakPtr<UtilityProcessHost> utility_process_host_; | 245 base::WeakPtr<UtilityProcessHost> utility_process_host_; |
| 244 bool value_for_key_path_failed_; | 246 bool value_for_key_path_failed_; |
| 245 content::SerializedScriptValue expected_value_; | 247 content::SerializedScriptValue expected_value_; |
| 246 }; | 248 }; |
| 247 | 249 |
| 248 // This test fixture runs in the UI thread. However, most of the work done by | 250 // This test fixture runs in the UI thread. However, most of the work done by |
| 249 // UtilityProcessHost (and wrapped by IDBKeyPathHelper above) happens on the IO | 251 // UtilityProcessHost (and wrapped by IDBKeyPathHelper above) happens on the IO |
| 250 // thread. This fixture delegates to IDBKeyPathHelper and blocks via | 252 // thread. This fixture delegates to IDBKeyPathHelper and blocks via |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f, | 430 0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f, |
| 429 0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f, | 431 0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f, |
| 430 0x5302, 0x6203, 0x7a61, 0x023f, 0x0853, | 432 0x5302, 0x6203, 0x7a61, 0x023f, 0x0853, |
| 431 0x796d, 0x654e, 0x4b77, 0x7965, 0x017b, | 433 0x796d, 0x654e, 0x4b77, 0x7965, 0x017b, |
| 432 0x027b}; | 434 0x027b}; |
| 433 content::SerializedScriptValue expected_value2( | 435 content::SerializedScriptValue expected_value2( |
| 434 false, false, string16(expected_data2, arraysize(expected_data2))); | 436 false, false, string16(expected_data2, arraysize(expected_data2))); |
| 435 scoped_helper.SetExpectedValue(expected_value2); | 437 scoped_helper.SetExpectedValue(expected_value2); |
| 436 scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar.baz")); | 438 scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar.baz")); |
| 437 } | 439 } |
| OLD | NEW |