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/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "chrome/test/automation/tab_proxy.h" | 8 #include "chrome/test/automation/tab_proxy.h" |
9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
10 #include "chrome/test/ui/ui_layout_test.h" | 10 #include "chrome/test/ui/ui_layout_test.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 void AddJSTestResources() { | 29 void AddJSTestResources() { |
30 // Add other paths our tests require. | 30 // Add other paths our tests require. |
31 FilePath js_dir = FilePath(). | 31 FilePath js_dir = FilePath(). |
32 AppendASCII("fast").AppendASCII("js"); | 32 AppendASCII("fast").AppendASCII("js"); |
33 AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources")); | 33 AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources")); |
34 } | 34 } |
35 | 35 |
36 FilePath test_dir_; | 36 FilePath test_dir_; |
37 }; | 37 }; |
38 | 38 |
39 TEST_F(IndexedDBUILayoutTest, DISABLED_LayoutTests) { | 39 TEST_F(IndexedDBUILayoutTest, LayoutTests) { |
40 const int port = kNoHttpPort; | 40 const int port = kNoHttpPort; |
41 InitializeForLayoutTest(test_dir_, FilePath(), port); | 41 InitializeForLayoutTest(test_dir_, FilePath(), port); |
42 AddJSTestResources(); | 42 AddJSTestResources(); |
43 for (size_t i = 0; i < arraysize(kLayoutTestFileNames); ++i) | 43 for (size_t i = 0; i < arraysize(kLayoutTestFileNames); ++i) |
44 RunLayoutTest(kLayoutTestFileNames[i], port); | 44 RunLayoutTest(kLayoutTestFileNames[i], port); |
45 } | 45 } |
OLD | NEW |