Update to Chromium revision 237081.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1532 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/browser/browser_main.cc

@@ -70,7 +70,7 @@ int CefBrowserMainParts::PreCreateThreads() {
   // Initialize user preferences.
   pref_store_ = new CefBrowserPrefStore();
   pref_store_->SetInitializationCompleted();
-  pref_service_.reset(pref_store_->CreateService());
+  pref_service_ = pref_store_->CreateService().Pass();
 
   // Create a v8::Isolate for the current thread if it doesn't already exist.
   if (!v8::Isolate::GetCurrent()) {

libcef/browser/browser_pref_store.cc

@@ -6,7 +6,8 @@
 #include "libcef/browser/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
-#include "base/prefs/pref_service_builder.h"
+#include "base/prefs/pref_service.h"
+#include "base/prefs/pref_service_factory.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/values.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
@@ -17,11 +18,11 @@
 CefBrowserPrefStore::CefBrowserPrefStore() {
 }
 
-PrefService* CefBrowserPrefStore::CreateService() {
-  PrefServiceBuilder builder;
-  builder.WithCommandLinePrefs(
+scoped_ptr<PrefService> CefBrowserPrefStore::CreateService() {
+  base::PrefServiceFactory factory;
+  factory.set_command_line_prefs(
       new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
-  builder.WithUserPrefs(this);
+  factory.set_user_prefs(this);
 
   scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple());
 
@@ -31,7 +32,7 @@ PrefService* CefBrowserPrefStore::CreateService() {
 
   registry->RegisterBooleanPref(prefs::kPrintingEnabled, true);
 
-  return builder.Create(registry);
+  return factory.Create(registry);
 }
 
 CefBrowserPrefStore::~CefBrowserPrefStore() {

libcef/browser/browser_pref_store.h

@@ -5,6 +5,7 @@
 #ifndef CEF_LIBCEF_BROWSER_BROWSER_PREF_STORE_H_
 #define CEF_LIBCEF_BROWSER_BROWSER_PREF_STORE_H_
 
+#include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_store.h"
 
 class PrefService;
@@ -13,7 +14,7 @@ class CefBrowserPrefStore : public TestingPrefStore {
  public:
   CefBrowserPrefStore();
 
-  PrefService* CreateService();
+  scoped_ptr<PrefService> CreateService();
 
  protected:
   virtual ~CefBrowserPrefStore();

libcef/browser/render_widget_host_view_osr.cc

@@ -12,7 +12,7 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_view_host.h"
-#include "third_party/WebKit/public/web/WebScreenInfo.h"
+#include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "webkit/common/cursors/webcursor.h"
 
 namespace {