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

Side by Side Diff: chrome/browser/chromeos/extensions/gfx_utils_unittest.cc

Issue 2934043002: Use ContainsValue() instead of std::find() in chrome/browser/chromeos (Closed)
Patch Set: Fixed compilation error. Created 3 years, 6 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/chromeos/extensions/gfx_utils.h" 5 #include "chrome/browser/chromeos/extensions/gfx_utils.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/stl_util.h"
8 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_service_test_base.h" 10 #include "chrome/browser/extensions/extension_service_test_base.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" 12 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
12 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
13 #include "components/arc/test/fake_app_instance.h" 14 #include "components/arc/test/fake_app_instance.h"
14 #include "extensions/common/extension.h" 15 #include "extensions/common/extension.h"
15 #include "extensions/common/extension_builder.h" 16 #include "extensions/common/extension_builder.h"
16 17
17 namespace extensions { 18 namespace extensions {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 extensions::util::GetEquivalentInstalledExtensions(profile(), 157 extensions::util::GetEquivalentInstalledExtensions(profile(),
157 kGmailArcPackage); 158 kGmailArcPackage);
158 EXPECT_TRUE(0 == extension_ids.size()); 159 EXPECT_TRUE(0 == extension_ids.size());
159 160
160 // Install Gmail extension app. 161 // Install Gmail extension app.
161 scoped_refptr<Extension> extension1 = CreateExtension(kGmailExtensionId1); 162 scoped_refptr<Extension> extension1 = CreateExtension(kGmailExtensionId1);
162 AddExtension(extension1.get()); 163 AddExtension(extension1.get());
163 extension_ids = extensions::util::GetEquivalentInstalledExtensions( 164 extension_ids = extensions::util::GetEquivalentInstalledExtensions(
164 profile(), kGmailArcPackage); 165 profile(), kGmailArcPackage);
165 EXPECT_TRUE(1 == extension_ids.size()); 166 EXPECT_TRUE(1 == extension_ids.size());
166 EXPECT_TRUE(std::find(extension_ids.begin(), extension_ids.end(), 167 EXPECT_TRUE(base::ContainsValue(extension_ids, kGmailExtensionId1));
167 kGmailExtensionId1) != extension_ids.end());
168 168
169 // Install another Gmail extension app. 169 // Install another Gmail extension app.
170 scoped_refptr<Extension> extension2 = CreateExtension(kGmailExtensionId2); 170 scoped_refptr<Extension> extension2 = CreateExtension(kGmailExtensionId2);
171 AddExtension(extension2.get()); 171 AddExtension(extension2.get());
172 extension_ids = extensions::util::GetEquivalentInstalledExtensions( 172 extension_ids = extensions::util::GetEquivalentInstalledExtensions(
173 profile(), kGmailArcPackage); 173 profile(), kGmailArcPackage);
174 EXPECT_TRUE(2 == extension_ids.size()); 174 EXPECT_TRUE(2 == extension_ids.size());
175 EXPECT_TRUE(std::find(extension_ids.begin(), extension_ids.end(), 175 EXPECT_TRUE(base::ContainsValue(extension_ids, kGmailExtensionId1));
176 kGmailExtensionId1) != extension_ids.end()); 176 EXPECT_TRUE(base::ContainsValue(extension_ids, kGmailExtensionId2));
177 EXPECT_TRUE(std::find(extension_ids.begin(), extension_ids.end(),
178 kGmailExtensionId2) != extension_ids.end());
179 177
180 RemoveExtension(extension1.get()); 178 RemoveExtension(extension1.get());
181 extension_ids = extensions::util::GetEquivalentInstalledExtensions( 179 extension_ids = extensions::util::GetEquivalentInstalledExtensions(
182 profile(), kGmailArcPackage); 180 profile(), kGmailArcPackage);
183 EXPECT_TRUE(1 == extension_ids.size()); 181 EXPECT_TRUE(1 == extension_ids.size());
184 EXPECT_FALSE(std::find(extension_ids.begin(), extension_ids.end(), 182 EXPECT_FALSE(base::ContainsValue(extension_ids, kGmailExtensionId1));
185 kGmailExtensionId1) != extension_ids.end()); 183 EXPECT_TRUE(base::ContainsValue(extension_ids, kGmailExtensionId2));
186 EXPECT_TRUE(std::find(extension_ids.begin(), extension_ids.end(),
187 kGmailExtensionId2) != extension_ids.end());
188 184
189 RemoveExtension(extension2.get()); 185 RemoveExtension(extension2.get());
190 extension_ids = extensions::util::GetEquivalentInstalledExtensions( 186 extension_ids = extensions::util::GetEquivalentInstalledExtensions(
191 profile(), kGmailArcPackage); 187 profile(), kGmailArcPackage);
192 EXPECT_TRUE(0 == extension_ids.size()); 188 EXPECT_TRUE(0 == extension_ids.size());
193 189
194 // Install an unrelated Google Keep extension app. 190 // Install an unrelated Google Keep extension app.
195 scoped_refptr<Extension> extension = CreateExtension(kKeepExtensionId); 191 scoped_refptr<Extension> extension = CreateExtension(kKeepExtensionId);
196 AddExtension(extension.get()); 192 AddExtension(extension.get());
197 extension_ids = extensions::util::GetEquivalentInstalledExtensions( 193 extension_ids = extensions::util::GetEquivalentInstalledExtensions(
198 profile(), kGmailArcPackage); 194 profile(), kGmailArcPackage);
199 EXPECT_TRUE(0 == extension_ids.size()); 195 EXPECT_TRUE(0 == extension_ids.size());
200 } 196 }
201 197
202 } // namespace extensions 198 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698