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" |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 extensions::NOTIFICATION_CRX_INSTALLER_DONE, | 172 extensions::NOTIFICATION_CRX_INSTALLER_DONE, |
173 content::Source<extensions::CrxInstaller>(installer.get())); | 173 content::Source<extensions::CrxInstaller>(installer.get())); |
174 | 174 |
175 installer->InstallCrx(crx_path); | 175 installer->InstallCrx(crx_path); |
176 | 176 |
177 observer_->Wait(); | 177 observer_->Wait(); |
178 } | 178 } |
179 | 179 |
180 size_t num_after = registry->enabled_extensions().size(); | 180 size_t num_after = registry->enabled_extensions().size(); |
181 if (num_before + 1 != num_after) { | 181 if (num_before + 1 != num_after) { |
182 VLOG(1) << "Num extensions before: " << base::IntToString(num_before) | 182 VLOG(1) << "Num extensions before: " << base::SizeTToString(num_before) |
183 << " num after: " << base::IntToString(num_after) | 183 << " num after: " << base::SizeTToString(num_after) |
184 << " Installed extensions follow:"; | 184 << " Installed extensions follow:"; |
185 | 185 |
186 for (const scoped_refptr<const Extension>& extension : | 186 for (const scoped_refptr<const Extension>& extension : |
187 registry->enabled_extensions()) | 187 registry->enabled_extensions()) |
188 VLOG(1) << " " << extension->id(); | 188 VLOG(1) << " " << extension->id(); |
189 | 189 |
190 VLOG(1) << "Errors follow:"; | 190 VLOG(1) << "Errors follow:"; |
191 const std::vector<base::string16>* errors = | 191 const std::vector<base::string16>* errors = |
192 ExtensionErrorReporter::GetInstance()->GetErrors(); | 192 ExtensionErrorReporter::GetInstance()->GetErrors(); |
193 for (std::vector<base::string16>::const_iterator iter = errors->begin(); | 193 for (std::vector<base::string16>::const_iterator iter = errors->begin(); |
194 iter != errors->end(); ++iter) | 194 iter != errors->end(); ++iter) |
195 VLOG(1) << *iter; | 195 VLOG(1) << *iter; |
196 | 196 |
197 return nullptr; | 197 return nullptr; |
198 } | 198 } |
199 | 199 |
200 if (!observer_->WaitForExtensionViewsToLoad()) | 200 if (!observer_->WaitForExtensionViewsToLoad()) |
201 return nullptr; | 201 return nullptr; |
202 return service->GetExtensionById(last_loaded_extension_id(), false); | 202 return service->GetExtensionById(last_loaded_extension_id(), false); |
203 } | 203 } |
OLD | NEW |