| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 observer_->Wait(); | 104 observer_->Wait(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 size_t num_after = service->extensions()->size(); | 107 size_t num_after = service->extensions()->size(); |
| 108 if (num_before + 1 != num_after) { | 108 if (num_before + 1 != num_after) { |
| 109 VLOG(1) << "Num extensions before: " << base::IntToString(num_before) | 109 VLOG(1) << "Num extensions before: " << base::IntToString(num_before) |
| 110 << " num after: " << base::IntToString(num_after) | 110 << " num after: " << base::IntToString(num_after) |
| 111 << " Installed extensions follow:"; | 111 << " Installed extensions follow:"; |
| 112 | 112 |
| 113 for (ExtensionSet::const_iterator it = service->extensions()->begin(); | 113 for (extensions::ExtensionSet::const_iterator it = |
| 114 service->extensions()->begin(); |
| 114 it != service->extensions()->end(); ++it) | 115 it != service->extensions()->end(); ++it) |
| 115 VLOG(1) << " " << (*it)->id(); | 116 VLOG(1) << " " << (*it)->id(); |
| 116 | 117 |
| 117 VLOG(1) << "Errors follow:"; | 118 VLOG(1) << "Errors follow:"; |
| 118 const std::vector<string16>* errors = | 119 const std::vector<string16>* errors = |
| 119 ExtensionErrorReporter::GetInstance()->GetErrors(); | 120 ExtensionErrorReporter::GetInstance()->GetErrors(); |
| 120 for (std::vector<string16>::const_iterator iter = errors->begin(); | 121 for (std::vector<string16>::const_iterator iter = errors->begin(); |
| 121 iter != errors->end(); ++iter) | 122 iter != errors->end(); ++iter) |
| 122 VLOG(1) << *iter; | 123 VLOG(1) << *iter; |
| 123 | 124 |
| 124 return NULL; | 125 return NULL; |
| 125 } | 126 } |
| 126 | 127 |
| 127 if (!observer_->WaitForExtensionViewsToLoad()) | 128 if (!observer_->WaitForExtensionViewsToLoad()) |
| 128 return NULL; | 129 return NULL; |
| 129 return service->GetExtensionById(last_loaded_extension_id(), false); | 130 return service->GetExtensionById(last_loaded_extension_id(), false); |
| 130 } | 131 } |
| OLD | NEW |