OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/defaults.h" | 21 #include "chrome/browser/defaults.h" |
22 #include "chrome/browser/profiles/profile_manager.h" | 22 #include "chrome/browser/profiles/profile_manager.h" |
23 #include "chrome/browser/sessions/session_service.h" | 23 #include "chrome/browser/sessions/session_service.h" |
24 #include "chrome/browser/sessions/session_service_test_helper.h" | 24 #include "chrome/browser/sessions/session_service_test_helper.h" |
25 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
27 #include "chrome/test/base/browser_with_test_window_test.h" | 27 #include "chrome/test/base/browser_with_test_window_test.h" |
28 #include "chrome/test/base/testing_browser_process.h" | 28 #include "chrome/test/base/testing_browser_process.h" |
29 #include "chrome/test/base/testing_profile.h" | 29 #include "chrome/test/base/testing_profile.h" |
30 #include "chrome/test/base/testing_profile_manager.h" | 30 #include "chrome/test/base/testing_profile_manager.h" |
31 #include "components/sessions/serialized_navigation_entry_test_helper.h" | 31 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" |
32 #include "components/sessions/session_command.h" | 32 #include "components/sessions/core/session_command.h" |
33 #include "components/sessions/session_types.h" | 33 #include "components/sessions/core/session_types.h" |
34 #include "content/public/browser/navigation_entry.h" | 34 #include "content/public/browser/navigation_entry.h" |
35 #include "content/public/browser/notification_observer.h" | 35 #include "content/public/browser/notification_observer.h" |
36 #include "content/public/browser/notification_registrar.h" | 36 #include "content/public/browser/notification_registrar.h" |
37 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
38 #include "content/public/common/page_state.h" | 38 #include "content/public/common/page_state.h" |
39 #include "testing/gtest/include/gtest/gtest.h" | 39 #include "testing/gtest/include/gtest/gtest.h" |
40 | 40 |
41 using content::NavigationEntry; | 41 using content::NavigationEntry; |
42 using sessions::SerializedNavigationEntry; | 42 using sessions::SerializedNavigationEntry; |
43 using sessions::SerializedNavigationEntryTestHelper; | 43 using sessions::SerializedNavigationEntryTestHelper; |
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1034 &cancelable_task_tracker); | 1034 &cancelable_task_tracker); |
1035 helper_.RunTaskOnBackendThread( | 1035 helper_.RunTaskOnBackendThread( |
1036 FROM_HERE, | 1036 FROM_HERE, |
1037 base::Bind(&PostBackToThread, | 1037 base::Bind(&PostBackToThread, |
1038 base::Unretained(base::MessageLoop::current()), | 1038 base::Unretained(base::MessageLoop::current()), |
1039 base::Unretained(&run_loop))); | 1039 base::Unretained(&run_loop))); |
1040 delete helper_.ReleaseService(); | 1040 delete helper_.ReleaseService(); |
1041 event.Signal(); | 1041 event.Signal(); |
1042 run_loop.Run(); | 1042 run_loop.Run(); |
1043 } | 1043 } |
OLD | NEW |