Unify infobars' link-opening behavior to respect user-requested dispositions and append the Googl...

chrome/common/logging_chrome.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
@@ skipping 383 matching lines @@
 
   chrome_logging_initialized_ = false;
   chrome_logging_redirected_ = false;
 }
 
 FilePath GetLogFileName() {
   std::string filename;
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (env->GetVar(env_vars::kLogFileName, &filename) && !filename.empty()) {
 #if defined(OS_WIN)
-    return FilePath(UTF8ToWide(filename).c_str());
+    return FilePath(UTF8ToWide(filename));
 #elif defined(OS_POSIX)
-    return FilePath(filename.c_str());
+    return FilePath(filename);
 #endif
   }
 
   const FilePath log_filename(FILE_PATH_LITERAL("chrome_debug.log"));
   FilePath log_path;
 
   if (PathService::Get(chrome::DIR_LOGS, &log_path)) {
     log_path = log_path.Append(log_filename);
     return log_path;
   } else {
@@ skipping 28 matching lines @@
         assertions->push_back(wide_line);
       ++assertion_count;
     }
   }
   log_file.close();
 
   return assertion_count;
 }
 
 }  // namespace logging