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

Side by Side Diff: base/file_version_info_unittest.cc

Issue 1507413003: clang/win: Let some chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_browsertests Created 5 years 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
« no previous file with comments | « no previous file | 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_version_info.h" 5 #include "base/file_version_info.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 }; 86 };
87 87
88 const bool kExpected[] = { 88 const bool kExpected[] = {
89 true, 89 true,
90 false, 90 false,
91 }; 91 };
92 92
93 // Test consistency check. 93 // Test consistency check.
94 ASSERT_EQ(arraysize(kDLLNames), arraysize(kExpected)); 94 ASSERT_EQ(arraysize(kDLLNames), arraysize(kExpected));
95 95
96 for (int i = 0; i < arraysize(kDLLNames); ++i) { 96 for (size_t i = 0; i < arraysize(kDLLNames); ++i) {
97 FilePath dll_path = GetTestDataPath(); 97 FilePath dll_path = GetTestDataPath();
98 dll_path = dll_path.Append(kDLLNames[i]); 98 dll_path = dll_path.Append(kDLLNames[i]);
99 99
100 scoped_ptr<FileVersionInfo> version_info( 100 scoped_ptr<FileVersionInfo> version_info(
101 FileVersionInfo::CreateFileVersionInfo(dll_path)); 101 FileVersionInfo::CreateFileVersionInfo(dll_path));
102 102
103 EXPECT_EQ(kExpected[i], version_info->is_official_build()); 103 EXPECT_EQ(kExpected[i], version_info->is_official_build());
104 } 104 }
105 } 105 }
106 #endif 106 #endif
(...skipping 21 matching lines...) Expand all
128 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str)); 128 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str));
129 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str); 129 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str);
130 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", 130 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043",
131 version_info_win->GetStringValue(L"Custom prop 3")); 131 version_info_win->GetStringValue(L"Custom prop 3"));
132 132
133 // Test an non-existing property. 133 // Test an non-existing property.
134 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str)); 134 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str));
135 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property")); 135 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property"));
136 } 136 }
137 #endif 137 #endif
OLDNEW
« no previous file with comments | « no previous file | base/file_version_info_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698