| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; | 131 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
| 132 chromeos::ScopedTestCrosSettings test_cros_settings_; | 132 chromeos::ScopedTestCrosSettings test_cros_settings_; |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 // The path to temporary directory used to contain the test operations. | 135 // The path to temporary directory used to contain the test operations. |
| 136 base::ScopedTempDir temp_dir_; | 136 base::ScopedTempDir temp_dir_; |
| 137 ScopedTestingLocalState local_state_; | 137 ScopedTestingLocalState local_state_; |
| 138 scoped_refptr<extensions::EventRouterForwarder> | 138 scoped_refptr<extensions::EventRouterForwarder> |
| 139 extension_event_router_forwarder_; | 139 extension_event_router_forwarder_; |
| 140 | 140 |
| 141 MessageLoopForUI message_loop_; | 141 base::MessageLoopForUI message_loop_; |
| 142 content::TestBrowserThread ui_thread_; | 142 content::TestBrowserThread ui_thread_; |
| 143 content::TestBrowserThread db_thread_; | 143 content::TestBrowserThread db_thread_; |
| 144 content::TestBrowserThread file_thread_; | 144 content::TestBrowserThread file_thread_; |
| 145 // IOThread is necessary for the creation of some services below. | 145 // IOThread is necessary for the creation of some services below. |
| 146 IOThread io_thread_; | 146 IOThread io_thread_; |
| 147 | 147 |
| 148 #if defined(OS_CHROMEOS) | 148 #if defined(OS_CHROMEOS) |
| 149 chromeos::ScopedTestUserManager test_user_manager_; | 149 chromeos::ScopedTestUserManager test_user_manager_; |
| 150 #endif | 150 #endif |
| 151 }; | 151 }; |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 browser2b.reset(); | 611 browser2b.reset(); |
| 612 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); | 612 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); |
| 613 ASSERT_EQ(1U, last_opened_profiles.size()); | 613 ASSERT_EQ(1U, last_opened_profiles.size()); |
| 614 EXPECT_EQ(profile1, last_opened_profiles[0]); | 614 EXPECT_EQ(profile1, last_opened_profiles[0]); |
| 615 | 615 |
| 616 browser1.reset(); | 616 browser1.reset(); |
| 617 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); | 617 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); |
| 618 ASSERT_EQ(0U, last_opened_profiles.size()); | 618 ASSERT_EQ(0U, last_opened_profiles.size()); |
| 619 } | 619 } |
| 620 #endif // !defined(OS_ANDROID) | 620 #endif // !defined(OS_ANDROID) |
| OLD | NEW |