Roll chromium_revision 212f976fef..61ed337cfe (387882:388120)

webrtc/base/pathutils.cc

Index: webrtc/base/pathutils.cc
diff --git a/webrtc/base/pathutils.cc b/webrtc/base/pathutils.cc
index b5227ecb10026ec534c859c8b501fcc6866d22c8..60e2b8bf47e51d6ffd0e9db7a8d04a68f0f9eb8d 100644
--- a/webrtc/base/pathutils.cc
+++ b/webrtc/base/pathutils.cc
@@ -13,7 +13,7 @@
 #include <shellapi.h>
 #include <shlobj.h>
 #include <tchar.h>
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN

[kwiberg-webrtc, 2016/04/19 09:21:01]

Your editor seems to be auto-cleaning trailing whitespace in the entire file.
With a CL much larger than this one, that might have been distracting.

[kjellander_webrtc, 2016/04/19 09:53:53]

Well, it's just this file so I'm gonna let them be fixed.

 
 #include "webrtc/base/common.h"
 #include "webrtc/base/fileutils.h"
@@ -35,9 +35,9 @@ const char* const FOLDER_DELIMS = "/\\";
 // DEFAULT_FOLDER_DELIM is the preferred delimiter for this platform
 #if WEBRTC_WIN
 const char DEFAULT_FOLDER_DELIM = '\\';
-#else  // !WEBRTC_WIN 
+#else  // !WEBRTC_WIN
 const char DEFAULT_FOLDER_DELIM = '/';
-#endif  // !WEBRTC_WIN 
+#endif  // !WEBRTC_WIN
 
 ///////////////////////////////////////////////////////////////////////////////
 // Pathname - parsing of pathnames into components, and vice versa
@@ -55,6 +55,8 @@ Pathname::Pathname()
     : folder_delimiter_(DEFAULT_FOLDER_DELIM) {
 }
 
+Pathname::Pathname(const Pathname&) = default;
+
 Pathname::Pathname(const std::string& pathname)
     : folder_delimiter_(DEFAULT_FOLDER_DELIM) {
   SetPathname(pathname);