Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: extensions/common/extension_resource_unittest.cc

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "extensions/common/constants.h" 10 #include "extensions/common/constants.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 base::FilePath path; 145 base::FilePath path;
146 std::string extension_id = id_util::GenerateId("test"); 146 std::string extension_id = id_util::GenerateId("test");
147 ExtensionResource resource(extension_id, temp.path(), 147 ExtensionResource resource(extension_id, temp.path(),
148 base::FilePath().AppendASCII(filename)); 148 base::FilePath().AppendASCII(filename));
149 base::FilePath resolved_path = resource.GetFilePath(); 149 base::FilePath resolved_path = resource.GetFilePath();
150 150
151 base::FilePath expected_path; 151 base::FilePath expected_path;
152 // Expect default path only, since fallback logic is disabled. 152 // Expect default path only, since fallback logic is disabled.
153 // See http://crbug.com/27359. 153 // See http://crbug.com/27359.
154 expected_path = root_resource; 154 expected_path = base::MakeAbsoluteFilePath(root_resource);
155 ASSERT_TRUE(file_util::AbsolutePath(&expected_path)); 155 ASSERT_FALSE(expected_path.empty());
156 156
157 EXPECT_EQ(ToLower(expected_path.value()), ToLower(resolved_path.value())); 157 EXPECT_EQ(ToLower(expected_path.value()), ToLower(resolved_path.value()));
158 EXPECT_EQ(ToLower(temp.path().value()), 158 EXPECT_EQ(ToLower(temp.path().value()),
159 ToLower(resource.extension_root().value())); 159 ToLower(resource.extension_root().value()));
160 EXPECT_EQ(ToLower(base::FilePath().AppendASCII(filename).value()), 160 EXPECT_EQ(ToLower(base::FilePath().AppendASCII(filename).value()),
161 ToLower(resource.relative_path().value())); 161 ToLower(resource.relative_path().value()));
162 } 162 }
163 163
164 } // namespace extensions 164 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698