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

Side by Side Diff: base/feature_list_unittest.cc

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « base/environment_unittest.cc ('k') | base/file_version_info_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/feature_list.h" 5 #include "base/feature_list.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/googletest/include/gtest/gtest.h"
11 11
12 namespace base { 12 namespace base {
13 13
14 namespace { 14 namespace {
15 15
16 const char kFeatureOnByDefaultName[] = "OnByDefault"; 16 const char kFeatureOnByDefaultName[] = "OnByDefault";
17 struct Feature kFeatureOnByDefault { 17 struct Feature kFeatureOnByDefault {
18 kFeatureOnByDefaultName, FEATURE_ENABLED_BY_DEFAULT 18 kFeatureOnByDefaultName, FEATURE_ENABLED_BY_DEFAULT
19 }; 19 };
20 20
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 EXPECT_EQ(kForcedOffGroupName, disable_trial->group_name()); 302 EXPECT_EQ(kForcedOffGroupName, disable_trial->group_name());
303 } else if (enable_trial) { 303 } else if (enable_trial) {
304 EXPECT_TRUE(FeatureList::IsEnabled(kFeatureOffByDefault)); 304 EXPECT_TRUE(FeatureList::IsEnabled(kFeatureOffByDefault));
305 EXPECT_TRUE(FieldTrialList::IsTrialActive(kTrialName)); 305 EXPECT_TRUE(FieldTrialList::IsTrialActive(kTrialName));
306 EXPECT_EQ(kForcedOnGroupName, enable_trial->group_name()); 306 EXPECT_EQ(kForcedOnGroupName, enable_trial->group_name());
307 } 307 }
308 } 308 }
309 } 309 }
310 310
311 } // namespace base 311 } // namespace base
OLDNEW
« no previous file with comments | « base/environment_unittest.cc ('k') | base/file_version_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698