Download webstore CRXs into separate directory.

chrome/browser/extensions/webstore_installer.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/extensions/webstore_installer.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 117 matching lines @@
       base::GetUniquePathNumber(file, base::FilePath::StringType());
   if (uniquifier > 0) {
     file = file.InsertBeforeExtensionASCII(
         base::StringPrintf(" (%d)", uniquifier));
   }
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file));
 }
 
-bool UseSeparateWebstoreDownloadDirectory() {
-  const char kFieldTrial[] = "WebstoreDownloadDirectory";
-  const char kSeparateDirectoryUnderUDD[] = "SeparateDirectoryUnderUDD";
-
-  std::string field_trial_group =
-      base::FieldTrialList::FindFullName(kFieldTrial);
-  return field_trial_group == kSeparateDirectoryUnderUDD;
-}
-
 void MaybeAppendAuthUserParameter(const std::string& authuser, GURL* url) {
   if (authuser.empty())
     return;
   std::string old_query = url->query();
   url::Component query(0, old_query.length());
   url::Component key, value;
   // Ensure that the URL doesn't already specify an authuser parameter.
   while (url::ExtractQueryKeyValue(
              old_query.c_str(), &query, &key, &value)) {
     std::string key_string = old_query.substr(key.begin, key.len);
@@ skipping 401 matching lines @@
     DownloadCrx(pending_modules_.front().extension_id, INSTALL_SOURCE_OTHER);
   }
 }
 
 void WebstoreInstaller::DownloadCrx(
     const std::string& extension_id,
     InstallSource source) {
   download_url_ = GetWebstoreInstallURL(extension_id, source);
   MaybeAppendAuthUserParameter(approval_->authuser, &download_url_);
 
-  base::FilePath download_path;
-  if (UseSeparateWebstoreDownloadDirectory()) {
-    base::FilePath user_data_dir;
-    PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-    download_path = user_data_dir.Append(kWebstoreDownloadFolder);
-  } else {
-    download_path = DownloadPrefs::FromDownloadManager(
-        BrowserContext::GetDownloadManager(profile_))->DownloadPath();
-  }
+  base::FilePath user_data_dir;
+  PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+  base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder);
 
   base::FilePath download_directory(g_download_directory_for_tests ?
       *g_download_directory_for_tests : download_path);
 
 #if defined(OS_CHROMEOS)
   // Do not use drive for extension downloads.
   if (drive::util::IsUnderDriveMountPoint(download_directory)) {
     download_directory = DownloadPrefs::FromBrowserContext(
         profile_)->GetDefaultDownloadDirectoryForProfile();
   }
@@ skipping 175 matching lines @@
         1,
         kMaxSizeKb,
         kNumBuckets);
   }
   UMA_HISTOGRAM_BOOLEAN(
       "Extensions.WebstoreDownload.InterruptTotalSizeUnknown",
       total_bytes <= 0);
 }
 
 }  // namespace extensions