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/extensions/test_extension_dir.h" | 5 #include "chrome/browser/extensions/test_extension_dir.h" |
6 | 6 |
7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 return base::FilePath(); | 60 return base::FilePath(); |
61 } | 61 } |
62 if (!base::PathExists(crx_path)) { | 62 if (!base::PathExists(crx_path)) { |
63 ADD_FAILURE() << crx_path.value() << " was not created."; | 63 ADD_FAILURE() << crx_path.value() << " was not created."; |
64 return base::FilePath(); | 64 return base::FilePath(); |
65 } | 65 } |
66 return crx_path; | 66 return crx_path; |
67 } | 67 } |
68 | 68 |
69 base::FilePath TestExtensionDir::UnpackedPath() { | 69 base::FilePath TestExtensionDir::UnpackedPath() { |
70 return dir_.GetPath(); | 70 // We make this absolute because it's possible that dir_ contains a symlink as |
| 71 // part of it's path. When UnpackedInstaller::GetAbsolutePath() runs as part |
| 72 // of loading the extension, the extension's path is converted to an absolute |
| 73 // path, which actually does something like `realpath` as part of its |
| 74 // resolution. If the tests are comparing paths to UnpackedPath(), then |
| 75 // they'll need to compare the same absolute'd path. |
| 76 return base::MakeAbsoluteFilePath(dir_.GetPath()); |
71 } | 77 } |
72 | 78 |
73 } // namespace extensions | 79 } // namespace extensions |
OLD | NEW |