OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/extensions/crx_installer.h" | 11 #include "chrome/browser/extensions/crx_installer.h" |
12 #include "chrome/browser/extensions/extension_error_reporter.h" | 12 #include "chrome/browser/extensions/extension_error_reporter.h" |
13 #include "chrome/browser/extensions/extension_install_prompt.h" | 13 #include "chrome/browser/extensions/extension_install_prompt.h" |
14 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
15 #include "chrome/browser/extensions/extension_system.h" | |
16 #include "chrome/browser/extensions/unpacked_installer.h" | 15 #include "chrome/browser/extensions/unpacked_installer.h" |
17 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
19 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
21 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
22 #include "content/public/browser/notification_registrar.h" | 21 #include "content/public/browser/notification_registrar.h" |
23 #include "content/public/browser/notification_service.h" | 22 #include "content/public/browser/notification_service.h" |
24 #include "content/public/browser/render_view_host.h" | 23 #include "content/public/browser/render_view_host.h" |
25 #include "content/public/test/browser_test_utils.h" | 24 #include "content/public/test/browser_test_utils.h" |
26 #include "content/public/test/test_utils.h" | 25 #include "content/public/test/test_utils.h" |
| 26 #include "extensions/browser/extension_system.h" |
27 #include "extensions/common/extension_set.h" | 27 #include "extensions/common/extension_set.h" |
28 | 28 |
29 using extensions::Extension; | 29 using extensions::Extension; |
30 | 30 |
31 ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest() | 31 ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest() |
32 : profile_(NULL) {} | 32 : profile_(NULL) {} |
33 | 33 |
34 ExtensionSettingsUIBrowserTest::~ExtensionSettingsUIBrowserTest() {} | 34 ExtensionSettingsUIBrowserTest::~ExtensionSettingsUIBrowserTest() {} |
35 | 35 |
36 Profile* ExtensionSettingsUIBrowserTest::GetProfile() { | 36 Profile* ExtensionSettingsUIBrowserTest::GetProfile() { |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 iter != errors->end(); ++iter) | 123 iter != errors->end(); ++iter) |
124 VLOG(1) << *iter; | 124 VLOG(1) << *iter; |
125 | 125 |
126 return NULL; | 126 return NULL; |
127 } | 127 } |
128 | 128 |
129 if (!observer_->WaitForExtensionViewsToLoad()) | 129 if (!observer_->WaitForExtensionViewsToLoad()) |
130 return NULL; | 130 return NULL; |
131 return service->GetExtensionById(last_loaded_extension_id(), false); | 131 return service->GetExtensionById(last_loaded_extension_id(), false); |
132 } | 132 } |
OLD | NEW |