Bug 1443136 - Fix build and clang-format bustage r=me

2 files changed, 7 insertions, 6 deletions

diff --git a/gtests/nss_bogo_shim/config.h b/gtests/nss_bogo_shim/config.h
index 07a5df2a7..0e7fb5ed5 100644
--- a/gtests/nss_bogo_shim/config.h
+++ b/gtests/nss_bogo_shim/config.h
@@ -32,10 +32,10 @@ class ConfigEntryBase {
   virtual bool Parse(std::queue<const char*>& args) = 0;
 
  protected:
-  bool ParseInternal(std::queue<const char*> &args, std::vector<int> &out);
-  bool ParseInternal(std::queue<const char*> &args, std::string &out);
-  bool ParseInternal(std::queue<const char*> &args, int &out);
-  bool ParseInternal(std::queue<const char*> &args, bool &out);
+  bool ParseInternal(std::queue<const char*>& args, std::vector<int>& out);
+  bool ParseInternal(std::queue<const char*>& args, std::string& out);
+  bool ParseInternal(std::queue<const char*>& args, int& out);
+  bool ParseInternal(std::queue<const char*>& args, bool& out);
 
   const std::string name_;
   const std::string type_;
@@ -49,7 +49,7 @@ class ConfigEntry : public ConfigEntryBase {
       : ConfigEntryBase(name, typeid(T).name()), value_(init) {}
   T get() const { return value_; }
 
-  bool Parse(std::queue<const char*> &args) {
+  bool Parse(std::queue<const char*>& args) {
     return ParseInternal(args, value_);
   }
 
diff --git a/gtests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc
index 1e76c5449..c3417b8c5 100644
--- a/gtests/nss_bogo_shim/nss_bogo_shim.cc
+++ b/gtests/nss_bogo_shim/nss_bogo_shim.cc
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "config.h"
 
+#include <algorithm>
 #include <cstdlib>
 #include <iostream>
 #include <memory>
@@ -298,7 +299,7 @@ class TestAgent {
     if (sign_prefs.empty()) {
       sign_prefs = verify_prefs;
     } else if (!verify_prefs.empty()) {
-      return false; // Both shouldn't be set.
+      return false;  // Both shouldn't be set.
     }
     if (!sign_prefs.empty()) {
       std::vector<SSLSignatureScheme> sig_schemes;