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

chrome/browser/media/media_stream_capture_indicator.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/media/media_stream_capture_indicator.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/screen_capture_notification_ui.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
@@ skipping 55 matching lines @@
   if (extension)
     return UTF8ToUTF16(extension->name());
 
   string16 tab_title = web_contents->GetTitle();
 
   if (tab_title.empty()) {
     // If the page's title is empty use its security originator.
     tab_title = GetSecurityOrigin(web_contents);
   } else {
     // If the page's title matches its URL, use its security originator.
+    Profile* profile =
+        Profile::FromBrowserContext(web_contents->GetBrowserContext());
     std::string languages =
-        content::GetContentClient()->browser()->GetAcceptLangs(
-            web_contents->GetBrowserContext());
+        profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
     if (tab_title == net::FormatUrl(web_contents->GetURL(), languages))
       tab_title = GetSecurityOrigin(web_contents);
   }
 
   return tab_title;
 }
 
 }  // namespace
 
 // Stores usage counts for all the capture devices associated with a single
@@ skipping 478 matching lines @@
   }
 
   UpdateNotificationUserInterface();
 }
 
 void MediaStreamCaptureIndicator::OnStopScreenCapture(
     const base::Closure& stop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   stop.Run();
 }