Remove logging for issue 35198.

chrome/common/extensions/extension_unpacker.cc

 // Copyright (c) 2010 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 "chrome/common/extensions/extension_unpacker.h"
 
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "net/base/file_stream.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
 #include "ipc/ipc_message_utils.h"
@@ skipping 117 matching lines @@
   return true;
 }
 
 bool ExtensionUnpacker::Run() {
   LOG(INFO) << "Installing extension " << extension_path_.value();
 
   // <profile>/Extensions/INSTALL_TEMP/<version>
   temp_install_dir_ =
     extension_path_.DirName().AppendASCII(filenames::kTempExtensionName);
 
+  if (!file_util::CreateDirectory(temp_install_dir_)) {
+
 #if defined(OS_WIN)
-  // To understand crbug/35198, allow users who can reproduce the issue
-  // to enable extra logging while unpacking.
-  bool extra_logging = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kIssue35198ExtraLogging);
-  LOG(INFO) << "Extra logging for issue 35198: " << extra_logging;
+    std::string dir_string = WideToUTF8(temp_install_dir_.value());
+#else
+    std::string dir_string = temp_install_dir_.value();
+#endif
 
-  std::ostringstream log_stream;
-  std::string dir_string = WideToUTF8(temp_install_dir_.value());
-  log_stream << kCouldNotCreateDirectoryError << dir_string << std::endl;
-
-  if (!file_util::CreateDirectoryExtraLogging(temp_install_dir_, log_stream)) {
-    if (extra_logging) {
-      log_stream.flush();
-      SetError(log_stream.str());
-    } else {
-      SetError(kCouldNotCreateDirectoryError + dir_string);
-    }
-    return false;
-  }
-#else
-  if (!file_util::CreateDirectory(temp_install_dir_)) {
-    std::string dir_string = temp_install_dir_.value();
     SetError(kCouldNotCreateDirectoryError + dir_string);
     return false;
   }
-#endif
 
   if (!Unzip(extension_path_, temp_install_dir_)) {
     SetError(kCouldNotUnzipExtension);
     return false;
   }
 
   // Parse the manifest.
   parsed_manifest_.reset(ReadManifest());
   if (!parsed_manifest_.get())
     return false;  // Error was already reported.
 
-  // NOTE: Since the Unpacker doesn't have the extension's public_id, the
+  // NOTE: Since the unpacker doesn't have the extension's public_id, the
   // InitFromValue is allowed to generate a temporary id for the extension.
   // ANY CODE THAT FOLLOWS SHOULD NOT DEPEND ON THE CORRECT ID OF THIS
   // EXTENSION.
   Extension extension(temp_install_dir_);
   std::string error;
-  if (!extension.InitFromValue(*parsed_manifest_,
-                               false,
-                               &error)) {
+  if (!extension.InitFromValue(*parsed_manifest_, false, &error)) {
     SetError(error);
     return false;
   }
 
   if (!extension_file_util::ValidateExtension(&extension, &error)) {
     SetError(error);
     return false;
   }
 
   // Decode any images that the browser needs to display.
@@ skipping 112 matching lines @@
 
   parsed_catalogs_->Set(WideToUTF8(relative_path.DirName().ToWStringHack()),
                         root.release());
 
   return true;
 }
 
 void ExtensionUnpacker::SetError(const std::string &error) {
   error_message_ = error;
 }