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

webrtc/base/pathutils.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_WIN)
 #include "webrtc/base/win32.h"
 #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"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/urlencode.h"
 
 namespace rtc {
 
 static const char EMPTY_STR[] = "";
 
 // EXT_DELIM separates a file basename from extension
 const char EXT_DELIM = '.';
 
 // FOLDER_DELIMS separate folder segments and the filename
 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
 ///////////////////////////////////////////////////////////////////////////////
 
 bool Pathname::IsFolderDelimiter(char ch) {
   return (NULL != ::strchr(FOLDER_DELIMS, ch));
 }
 
 char Pathname::DefaultFolderDelimiter() {
   return DEFAULT_FOLDER_DELIM;
 }
 
 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);
 }
 
 Pathname::Pathname(const std::string& folder, const std::string& filename)
     : folder_delimiter_(DEFAULT_FOLDER_DELIM) {
   SetPathname(folder, filename);
 }
 
@@ skipping 175 matching lines @@
   // sanity checking
   return (isalpha(drive[0]) &&
           drive[1] == ':' &&
           drive[2] == '\\');
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 } // namespace rtc