Revert 147594 - NaCl: Remove two uses of '#include "nacl/nacl_log.h"'

chrome/browser/download/download_prefs.cc

 // Copyright (c) 2012 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/browser/download/download_prefs.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/save_page_type.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
 
-DownloadPrefs::DownloadPrefs(PrefService* prefs) : prefs_(prefs) {
+DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
+  PrefService* prefs = profile->GetPrefs();
   prompt_for_download_.Init(prefs::kPromptForDownload, prefs, NULL);
   download_path_.Init(prefs::kDownloadDefaultDirectory, prefs, NULL);
   save_file_type_.Init(prefs::kSaveFileType, prefs, NULL);
 
   // We store any file extension that should be opened automatically at
   // download completion in this pref.
   std::string extensions_to_open =
       prefs->GetString(prefs::kDownloadExtensionsToOpen);
   std::vector<std::string> extensions;
   base::SplitString(extensions_to_open, ':', &extensions);
@@ skipping 66 matching lines @@
           download_manager->GetDelegate());
   return delegate->download_prefs();
 }
 
 // static
 DownloadPrefs* DownloadPrefs::FromBrowserContext(
     content::BrowserContext* context) {
   return FromDownloadManager(BrowserContext::GetDownloadManager(context));
 }
 
+FilePath DownloadPrefs::DownloadPath() const {
+#if defined(OS_CHROMEOS)
+  // If the download path is under /drive, and GDataSystemService isn't
+  // available (which it isn't for incognito mode, for instance), use the
+  // default download directory (/Downloads).
+  if (gdata::util::IsUnderGDataMountPoint(*download_path_) &&
+      !gdata::GDataSystemServiceFactory::GetForProfile(profile_))
+    return download_util::GetDefaultDownloadDirectory();
+#endif
+  return *download_path_;
+}
+
 bool DownloadPrefs::PromptForDownload() const {
   // If the DownloadDirectory policy is set, then |prompt_for_download_| should
   // always be false.
   DCHECK(!download_path_.IsManaged() || !prompt_for_download_.GetValue());
   return *prompt_for_download_;
 }
 
 bool DownloadPrefs::IsDownloadPathManaged() const {
   return download_path_.IsManaged();
 }
@@ skipping 42 matching lines @@
     std::string this_extension = *it;
 #elif defined(OS_WIN)
     // TODO(phajdan.jr): Why we're using Sys conversion here, but not in ctor?
     std::string this_extension = base::SysWideToUTF8(*it);
 #endif
     extensions += this_extension + ":";
   }
   if (!extensions.empty())
     extensions.erase(extensions.size() - 1);
 
-  prefs_->SetString(prefs::kDownloadExtensionsToOpen, extensions);
+  profile_->GetPrefs()->SetString(prefs::kDownloadExtensionsToOpen, extensions);
 }
 
 bool DownloadPrefs::AutoOpenCompareFunctor::operator()(
     const FilePath::StringType& a,
     const FilePath::StringType& b) const {
   return FilePath::CompareLessIgnoreCase(a, b);
 }