Reland r54418 - base: Add UnSetEnv function to EnvVarGetter API.

chrome/browser/shell_integration_unittest.cc

Index: chrome/browser/shell_integration_unittest.cc
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 0514781d4994b31f22fb6c208903f8866554c27b..dbaa290550713df0b8c84533be853d328fc5d784 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -32,8 +32,7 @@ namespace {
 // Provides mock environment variables values based on a stored map.
 class MockEnvVarGetter : public base::EnvVarGetter {
  public:
-  MockEnvVarGetter() {
-  }
+  MockEnvVarGetter() {}
 
   void Set(const std::string& name, const std::string& value) {
     variables_[name] = value;
@@ -49,7 +48,12 @@ class MockEnvVarGetter : public base::EnvVarGetter {
   }
 
   virtual bool SetEnv(const char* variable_name, const std::string& new_value) {
-    NOTIMPLEMENTED();
+    ADD_FAILURE();
+    return false;
+  }
+
+  virtual bool UnSetEnv(const char* variable_name) {
+    ADD_FAILURE();
     return false;
   }