OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <stdlib.h> | 5 #include <stdlib.h> |
6 #include <windows.h> | 6 #include <windows.h> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "chrome/browser/url_fixer_upper.h" | 12 #include "chrome/browser/net/url_fixer_upper.h" |
13 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
14 #include "googleurl/src/url_parse.h" | 14 #include "googleurl/src/url_parse.h" |
15 #include "googleurl/src/gurl.h" | 15 #include "googleurl/src/gurl.h" |
16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
18 | 18 |
19 namespace { | 19 namespace { |
20 class URLFixerUpperTest : public testing::Test { | 20 class URLFixerUpperTest : public testing::Test { |
21 }; | 21 }; |
22 }; | 22 }; |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 // (should resolve to the same file as above) | 325 // (should resolve to the same file as above) |
326 relative_file = sub_dir + L"\\../" + sub_dir + L"\\\\\\.\\" + sub_file; | 326 relative_file = sub_dir + L"\\../" + sub_dir + L"\\\\\\.\\" + sub_file; |
327 fixedup = URLFixerUpper::FixupRelativeFile(dir, relative_file); | 327 fixedup = URLFixerUpper::FixupRelativeFile(dir, relative_file); |
328 EXPECT_PRED2(IsMatchingFileURL, fixedup, full_path); | 328 EXPECT_PRED2(IsMatchingFileURL, fixedup, full_path); |
329 | 329 |
330 // done with the subdir | 330 // done with the subdir |
331 EXPECT_TRUE(DeleteFile(full_path.c_str())); | 331 EXPECT_TRUE(DeleteFile(full_path.c_str())); |
332 EXPECT_TRUE(RemoveDirectory(new_dir.c_str())); | 332 EXPECT_TRUE(RemoveDirectory(new_dir.c_str())); |
333 } | 333 } |
334 | 334 |
OLD | NEW |