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

Side by Side Diff: base/environment_unittest.cc

Issue 1479473002: base: Use std::move() instead of Pass() for real movable types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: basepass: missing-include 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 | « base/environment.cc ('k') | base/feature_list_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 (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/environment.h" 5 #include "base/environment.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "testing/platform_test.h" 8 #include "testing/platform_test.h"
9 9
10 typedef PlatformTest EnvironmentTest; 10 typedef PlatformTest EnvironmentTest;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 123
124 #else 124 #else
125 125
126 TEST_F(EnvironmentTest, AlterEnvironment) { 126 TEST_F(EnvironmentTest, AlterEnvironment) {
127 const char* const empty[] = { NULL }; 127 const char* const empty[] = { NULL };
128 const char* const a2[] = { "A=2", NULL }; 128 const char* const a2[] = { "A=2", NULL };
129 EnvironmentMap changes; 129 EnvironmentMap changes;
130 scoped_ptr<char*[]> e; 130 scoped_ptr<char*[]> e;
131 131
132 e = AlterEnvironment(empty, changes).Pass(); 132 e = AlterEnvironment(empty, changes);
133 EXPECT_TRUE(e[0] == NULL); 133 EXPECT_TRUE(e[0] == NULL);
134 134
135 changes["A"] = "1"; 135 changes["A"] = "1";
136 e = AlterEnvironment(empty, changes); 136 e = AlterEnvironment(empty, changes);
137 EXPECT_EQ(std::string("A=1"), e[0]); 137 EXPECT_EQ(std::string("A=1"), e[0]);
138 EXPECT_TRUE(e[1] == NULL); 138 EXPECT_TRUE(e[1] == NULL);
139 139
140 changes.clear(); 140 changes.clear();
141 changes["A"] = std::string(); 141 changes["A"] = std::string();
142 e = AlterEnvironment(empty, changes); 142 e = AlterEnvironment(empty, changes);
(...skipping 12 matching lines...) Expand all
155 155
156 changes.clear(); 156 changes.clear();
157 changes["A"] = std::string(); 157 changes["A"] = std::string();
158 e = AlterEnvironment(a2, changes); 158 e = AlterEnvironment(a2, changes);
159 EXPECT_TRUE(e[0] == NULL); 159 EXPECT_TRUE(e[0] == NULL);
160 } 160 }
161 161
162 #endif 162 #endif
163 163
164 } // namespace base 164 } // namespace base
OLDNEW
« no previous file with comments | « base/environment.cc ('k') | base/feature_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698