[WebView] Remove more redundant classes

android_webview/browser/aw_content_browser_client.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 "android_webview/browser/aw_content_browser_client.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
+#include "android_webview/browser/aw_contents.h"
 #include "android_webview/browser/aw_contents_client_bridge.h"
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/aw_devtools_manager_delegate.h"
-#include "android_webview/browser/aw_locale_manager.h"
 #include "android_webview/browser/aw_printing_message_filter.h"
 #include "android_webview/browser/aw_quota_permission_context.h"
-#include "android_webview/browser/aw_web_preferences_populater.h"
+#include "android_webview/browser/aw_settings.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/browser/tracing/aw_tracing_delegate.h"
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/crash_reporter/aw_microdump_crash_reporter.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/url_constants.h"
@@ skipping 128 matching lines @@
                  << url;
   }
 }
 
 void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
                                                 int child_render_frame_id) {
   AwContentsIoThreadClient::SubFrameCreated(
       process_id_, parent_render_frame_id, child_render_frame_id);
 }
 
-AwLocaleManager* g_locale_manager = NULL;
-
 // A dummy binder for mojo interface autofill::mojom::PasswordManagerDriver.
 void DummyBindPasswordManagerDriver(
     const service_manager::BindSourceInfo& source_info,
     autofill::mojom::PasswordManagerDriverRequest request) {}
 
 }  // anonymous namespace
 
 // TODO(yirui): can use similar logic as in PrependToAcceptLanguagesIfNecessary
 // in chrome/browser/android/preferences/pref_service_bridge.cc
 // static
 std::string AwContentBrowserClient::GetAcceptLangsImpl() {
   // Start with the current locale(s) in BCP47 format.
-  std::string locales_string = g_locale_manager->GetLocaleList();
+  std::string locales_string = AwContents::GetLocaleList();
 
   // If accept languages do not contain en-US, add in en-US which will be
   // used with a lower q-value.
   if (locales_string.find("en-US") == std::string::npos)
     locales_string += ",en-US";
   return locales_string;
 }
 
 // static
 AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() {
   return AwBrowserContext::GetDefault();
 }
 
 AwContentBrowserClient::AwContentBrowserClient(
     JniDependencyFactory* native_factory)
     : native_factory_(native_factory) {
-  g_locale_manager = native_factory->CreateAwLocaleManager();
 }
 
-AwContentBrowserClient::~AwContentBrowserClient() {
-  delete g_locale_manager;
-  g_locale_manager = NULL;
-}
+AwContentBrowserClient::~AwContentBrowserClient() {}
 
 AwBrowserContext* AwContentBrowserClient::InitBrowserContext() {
   base::FilePath user_data_dir;
   if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
     NOTREACHED() << "Failed to get app data directory for Android WebView";
   }
   browser_context_.reset(
       new AwBrowserContext(user_data_dir, native_factory_));
   return browser_context_.get();
 }
@@ skipping 291 matching lines @@
   fd = ui::GetLocalePackFd(&region);
   mappings->ShareWithRegion(kAndroidWebViewLocalePakDescriptor, fd, region);
 
   breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted(
       child_process_id, mappings);
 }
 
 void AwContentBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* rvh,
     content::WebPreferences* web_prefs) {
-  if (!preferences_populater_.get()) {
-    preferences_populater_ =
-        base::WrapUnique(native_factory_->CreateWebPreferencesPopulater());
+  AwSettings* aw_settings = AwSettings::FromWebContents(
+      content::WebContents::FromRenderViewHost(rvh));
+  if (aw_settings) {
+    aw_settings->PopulateWebPreferences(web_prefs);
   }
-  preferences_populater_->PopulateFor(
-      content::WebContents::FromRenderViewHost(rvh), web_prefs);
 }
 
 std::vector<std::unique_ptr<content::NavigationThrottle>>
 AwContentBrowserClient::CreateThrottlesForNavigation(
     content::NavigationHandle* navigation_handle) {
   std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
   // We allow intercepting only navigations within main frames. This
   // is used to post onPageStarted. We handle shouldOverrideUrlLoading
   // via a sync IPC.
   if (navigation_handle->IsInMainFrame()) {
@@ skipping 33 matching lines @@
                  render_frame_host));
 
   // Although WebView does not support password manager feature, renderer code
   // could still request this interface, so we register a dummy binder which
   // just drops the incoming request, to avoid the 'Failed to locate a binder
   // for interface' error log..
   registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver));
 }
 
 }  // namespace android_webview