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

Side by Side Diff: base/file_version_info_unittest.cc

Issue 12294008: Fix more remaining FilePath -> base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « base/file_util_win.cc ('k') | base/file_version_info_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/file_version_info.h" 8 #include "base/file_version_info.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include "base/file_version_info_win.h" 12 #include "base/file_version_info_win.h"
13 #endif 13 #endif
14 14
15 using base::FilePath;
16
15 namespace { 17 namespace {
16 18
17 #if defined(OS_WIN) 19 #if defined(OS_WIN)
18 FilePath GetTestDataPath() { 20 FilePath GetTestDataPath() {
19 FilePath path; 21 FilePath path;
20 PathService::Get(base::DIR_SOURCE_ROOT, &path); 22 PathService::Get(base::DIR_SOURCE_ROOT, &path);
21 path = path.AppendASCII("base"); 23 path = path.AppendASCII("base");
22 path = path.AppendASCII("data"); 24 path = path.AppendASCII("data");
23 path = path.AppendASCII("file_version_info_unittest"); 25 path = path.AppendASCII("file_version_info_unittest");
24 return path; 26 return path;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str)); 131 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str));
130 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str); 132 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str);
131 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", 133 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043",
132 version_info_win->GetStringValue(L"Custom prop 3")); 134 version_info_win->GetStringValue(L"Custom prop 3"));
133 135
134 // Test an non-existing property. 136 // Test an non-existing property.
135 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str)); 137 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str));
136 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property")); 138 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property"));
137 } 139 }
138 #endif 140 #endif
OLDNEW
« no previous file with comments | « base/file_util_win.cc ('k') | base/file_version_info_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698