Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

chrome/browser/download/download_query.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_query.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_split.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_item.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "third_party/icu/public/i18n/unicode/regex.h"
 
 using content::DownloadDangerType;
 using content::DownloadItem;
 
 namespace {
@@ skipping 23 matching lines @@
   DCHECK_EQ(query, base::i18n::ToLower(query));
 
   string16 url_raw(UTF8ToUTF16(item.GetOriginalUrl().spec()));
   if (base::i18n::StringSearchIgnoringCaseAndAccents(
           query, url_raw, NULL, NULL)) {
     return true;
   }
 
   string16 url_formatted = url_raw;
   if (item.GetBrowserContext()) {
+    Profile* profile = Profile::FromBrowserContext(item.GetBrowserContext());
     url_formatted = net::FormatUrl(
         item.GetOriginalUrl(),
-        content::GetContentClient()->browser()->GetAcceptLangs(
-            item.GetBrowserContext()));
+        profile->GetPrefs()->GetString(prefs::kAcceptLanguages));
   }
   if (base::i18n::StringSearchIgnoringCaseAndAccents(
         query, url_formatted, NULL, NULL)) {
     return true;
   }
 
   string16 path(item.GetTargetFilePath().LossyDisplayName());
   return base::i18n::StringSearchIgnoringCaseAndAccents(
       query, path, NULL, NULL);
 }
@@ skipping 337 matching lines @@
 
 void DownloadQuery::FinishSearch(DownloadQuery::DownloadVector* results) const {
   if (!sorters_.empty())
     std::partial_sort(results->begin(),
                       results->begin() + std::min(limit_, results->size()),
                       results->end(),
                       DownloadComparator(sorters_));
   if (results->size() > limit_)
     results->resize(limit_);
 }