Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Side by Side Diff: content/browser/indexed_db/idbbindingutilities_browsertest.cc

Issue 9117040: Prep for landing WK76487 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move default: label to last, add bug URL to TODO comment Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/renderer_host/resource_dispatcher_host.h" 9 #include "content/browser/renderer_host/resource_dispatcher_host.h"
10 #include "content/browser/utility_process_host.h" 10 #include "content/browser/utility_process_host.h"
(...skipping 19 matching lines...) Expand all
30 30
31 ~ScopedShutdownWebKit() { 31 ~ScopedShutdownWebKit() {
32 WebKit::shutdown(); 32 WebKit::shutdown();
33 } 33 }
34 34
35 private: 35 private:
36 DISALLOW_COPY_AND_ASSIGN(ScopedShutdownWebKit); 36 DISALLOW_COPY_AND_ASSIGN(ScopedShutdownWebKit);
37 }; 37 };
38 38
39 // Sanity test, check the function call directly outside the sandbox. 39 // Sanity test, check the function call directly outside the sandbox.
40 TEST(IDBKeyPathWithoutSandbox, Value) { 40 // TODO(jsbell): Disabled to land WK76487; http://crbug.com/110956 has fix.
41 TEST(IDBKeyPathWithoutSandbox, DISABLED_Value) {
41 content::WebKitPlatformSupportImpl webkit_platform_support; 42 content::WebKitPlatformSupportImpl webkit_platform_support;
42 WebKit::initialize(&webkit_platform_support); 43 WebKit::initialize(&webkit_platform_support);
43 ScopedShutdownWebKit shutdown_webkit; 44 ScopedShutdownWebKit shutdown_webkit;
44 45
45 char16 data[] = {0x0353,0x6f66,0x536f,0x7a03,0x6f6f,0x017b}; 46 char16 data[] = {0x0353,0x6f66,0x536f,0x7a03,0x6f6f,0x017b};
46 std::vector<WebSerializedScriptValue> serialized_values; 47 std::vector<WebSerializedScriptValue> serialized_values;
47 serialized_values.push_back( 48 serialized_values.push_back(
48 WebSerializedScriptValue::fromString(string16(data, arraysize(data)))); 49 WebSerializedScriptValue::fromString(string16(data, arraysize(data))));
49 serialized_values.push_back( 50 serialized_values.push_back(
50 WebSerializedScriptValue::fromString(string16())); 51 WebSerializedScriptValue::fromString(string16()));
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f, 376 0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f,
376 0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f, 377 0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f,
377 0x5302, 0x6203, 0x7a61, 0x023f, 0x0853, 378 0x5302, 0x6203, 0x7a61, 0x023f, 0x0853,
378 0x796d, 0x654e, 0x4b77, 0x7965, 0x017b, 379 0x796d, 0x654e, 0x4b77, 0x7965, 0x017b,
379 0x027b}; 380 0x027b};
380 content::SerializedScriptValue expected_value2( 381 content::SerializedScriptValue expected_value2(
381 false, false, string16(expected_data2, arraysize(expected_data2))); 382 false, false, string16(expected_data2, arraysize(expected_data2)));
382 scoped_helper.SetExpectedValue(expected_value2); 383 scoped_helper.SetExpectedValue(expected_value2);
383 scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar.baz")); 384 scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar.baz"));
384 } 385 }
OLDNEW
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_browsertest.cc ('k') | content/common/indexed_db/indexed_db_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698