Make base::Environment::Create() return unique_ptrs.

chrome/browser/shell_integration_linux_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration_linux.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cstdlib>
@@ skipping 23 matching lines @@
 
 namespace shell_integration_linux {
 
 namespace {
 
 // Provides mock environment variables values based on a stored map.
 class MockEnvironment : public base::Environment {
  public:
   MockEnvironment() {}
 
-  void Set(const std::string& name, const std::string& value) {
+  void Set(base::StringPiece name, const std::string& value) {
     variables_[name] = value;
   }
 
-  bool GetVar(const char* variable_name, std::string* result) override {
+  bool GetVar(base::StringPiece variable_name, std::string* result) override {
     if (ContainsKey(variables_, variable_name)) {
       *result = variables_[variable_name];
       return true;
     }
 
     return false;
   }
 
-  bool SetVar(const char* variable_name,
+  bool SetVar(base::StringPiece variable_name,
               const std::string& new_value) override {
     ADD_FAILURE();
     return false;
   }
 
-  bool UnSetVar(const char* variable_name) override {
+  bool UnSetVar(base::StringPiece variable_name) override {
     ADD_FAILURE();
     return false;
   }
 
  private:
-  std::map<std::string, std::string> variables_;
+  std::map<base::StringPiece, std::string> variables_;

[dcheng, 2016/06/24 17:28:35]

It's not obvious that this is safe (or that it will be safe if the test changes
in the future), maybe it'd be safer to keep storing std::string in the map.

[Lei Zhang, 2016/06/24 18:56:03]

Sure. I don't have strong feelings about creating some extra strings in unit
tests.

 
   DISALLOW_COPY_AND_ASSIGN(MockEnvironment);
 };
 
 // This helps EXPECT_THAT(..., ElementsAre(...)) print out more meaningful
 // failure messages.
 std::vector<std::string> FilePathsToStrings(
     const std::vector<base::FilePath>& paths) {
   std::vector<std::string> values;
   for (const auto& path : paths)
@@ skipping 568 matching lines @@
 
   for (size_t i = 0; i < arraysize(test_cases); i++) {
     SCOPED_TRACE(i);
     EXPECT_EQ(test_cases[i].expected_output,
               GetDirectoryFileContents(base::ASCIIToUTF16(test_cases[i].title),
                                        test_cases[i].icon_name));
   }
 }
 
 }  // namespace shell_integration_linux