| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 if (!file_util::PathExists(dir_path)) { | 169 if (!file_util::PathExists(dir_path)) { |
| 170 ADD_FAILURE() << "Extension dir not found: " << dir_path.value(); | 170 ADD_FAILURE() << "Extension dir not found: " << dir_path.value(); |
| 171 return FilePath(); | 171 return FilePath(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 scoped_ptr<ExtensionCreator> creator(new ExtensionCreator()); | 174 scoped_ptr<ExtensionCreator> creator(new ExtensionCreator()); |
| 175 if (!creator->Run(dir_path, | 175 if (!creator->Run(dir_path, |
| 176 crx_path, | 176 crx_path, |
| 177 FilePath(), // no existing pem, use empty path | 177 FilePath(), // no existing pem, use empty path |
| 178 pem_path)) { | 178 pem_path)) { |
| 179 ADD_FAILURE() << "ExtensionCreator::Run() failed."; | 179 ADD_FAILURE() << "ExtensionCreator::Run() failed: " |
| 180 << creator->error_message(); |
| 180 return FilePath(); | 181 return FilePath(); |
| 181 } | 182 } |
| 182 | 183 |
| 183 if (!file_util::PathExists(crx_path)) { | 184 if (!file_util::PathExists(crx_path)) { |
| 184 ADD_FAILURE() << crx_path.value() << " was not created."; | 185 ADD_FAILURE() << crx_path.value() << " was not created."; |
| 185 return FilePath(); | 186 return FilePath(); |
| 186 } | 187 } |
| 187 return crx_path; | 188 return crx_path; |
| 188 } | 189 } |
| 189 | 190 |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 MessageLoopForUI::current()->Quit(); | 484 MessageLoopForUI::current()->Quit(); |
| 484 } | 485 } |
| 485 break; | 486 break; |
| 486 } | 487 } |
| 487 | 488 |
| 488 default: | 489 default: |
| 489 NOTREACHED(); | 490 NOTREACHED(); |
| 490 break; | 491 break; |
| 491 } | 492 } |
| 492 } | 493 } |
| OLD | NEW |