OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/scoped_temp_dir.h" | 7 #include "base/scoped_temp_dir.h" |
| 8 #include "base/test/thread_test_helper.h" |
8 #include "chrome/test/in_process_browser_test.h" | 9 #include "chrome/test/in_process_browser_test.h" |
9 #include "chrome/test/testing_profile.h" | 10 #include "chrome/test/testing_profile.h" |
10 #include "chrome/test/thread_test_helper.h" | |
11 #include "content/browser/in_process_webkit/dom_storage_context.h" | 11 #include "content/browser/in_process_webkit/dom_storage_context.h" |
12 #include "content/browser/in_process_webkit/webkit_context.h" | 12 #include "content/browser/in_process_webkit/webkit_context.h" |
13 | 13 |
14 typedef InProcessBrowserTest DOMStorageBrowserTest; | 14 typedef InProcessBrowserTest DOMStorageBrowserTest; |
15 | 15 |
16 // In proc browser test is needed here because ClearLocalState indirectly calls | 16 // In proc browser test is needed here because ClearLocalState indirectly calls |
17 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. | 17 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. |
18 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, ClearLocalState) { | 18 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, ClearLocalState) { |
19 // Create test files. | 19 // Create test files. |
20 ScopedTempDir temp_dir; | 20 ScopedTempDir temp_dir; |
(...skipping 14 matching lines...) Expand all Loading... |
35 | 35 |
36 // Create the scope which will ensure we run the destructor of the webkit | 36 // Create the scope which will ensure we run the destructor of the webkit |
37 // context which should trigger the clean up. | 37 // context which should trigger the clean up. |
38 { | 38 { |
39 TestingProfile profile; | 39 TestingProfile profile; |
40 WebKitContext *webkit_context = profile.GetWebKitContext(); | 40 WebKitContext *webkit_context = profile.GetWebKitContext(); |
41 webkit_context->dom_storage_context()->set_data_path(temp_dir.path()); | 41 webkit_context->dom_storage_context()->set_data_path(temp_dir.path()); |
42 webkit_context->set_clear_local_state_on_exit(true); | 42 webkit_context->set_clear_local_state_on_exit(true); |
43 } | 43 } |
44 // Make sure we wait until the destructor has run. | 44 // Make sure we wait until the destructor has run. |
45 scoped_refptr<ThreadTestHelper> helper( | 45 scoped_refptr<base::ThreadTestHelper> helper( |
46 new ThreadTestHelper(BrowserThread::WEBKIT)); | 46 new base::ThreadTestHelper( |
| 47 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::WEBKIT))); |
47 ASSERT_TRUE(helper->Run()); | 48 ASSERT_TRUE(helper->Run()); |
48 | 49 |
49 // Because we specified https for scheme to be skipped the second file | 50 // Because we specified https for scheme to be skipped the second file |
50 // should survive and the first go into vanity. | 51 // should survive and the first go into vanity. |
51 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); | 52 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); |
52 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); | 53 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); |
53 } | 54 } |
OLD | NEW |