diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 15:06:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:48:58 +0000 |
| commit | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch) | |
| tree | 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/chrome/browser/extensions/api/preference | |
| parent | be59a35641616a4cf23c4a13fa0632624b021c1b (diff) | |
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/preference')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/preference/preference_api.cc | 9 | ||||
| -rw-r--r-- | chromium/chrome/browser/extensions/api/preference/preference_apitest.cc | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chromium/chrome/browser/extensions/api/preference/preference_api.cc b/chromium/chrome/browser/extensions/api/preference/preference_api.cc index c16442b8097..b80fa289d37 100644 --- a/chromium/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chromium/chrome/browser/extensions/api/preference/preference_api.cc @@ -563,14 +563,13 @@ void PreferenceAPI::Shutdown() { content_settings_store()->RemoveObserver(this); } -static base::LazyInstance< - BrowserContextKeyedAPIFactory<PreferenceAPI>>::DestructorAtExit g_factory = - LAZY_INSTANCE_INITIALIZER; +static base::LazyInstance<BrowserContextKeyedAPIFactory<PreferenceAPI>>:: + DestructorAtExit g_preference_api_factory = LAZY_INSTANCE_INITIALIZER; // static BrowserContextKeyedAPIFactory<PreferenceAPI>* PreferenceAPI::GetFactoryInstance() { - return g_factory.Pointer(); + return g_preference_api_factory.Pointer(); } // static @@ -765,7 +764,7 @@ ExtensionFunction::ResponseAction SetPreferenceFunction::Run() { EXTENSION_FUNCTION_VALIDATE(!bad_message); return RespondNow(Error(error)); } - EXTENSION_FUNCTION_VALIDATE(browser_pref_value->GetType() == pref->GetType()); + EXTENSION_FUNCTION_VALIDATE(browser_pref_value->type() == pref->GetType()); // Validate also that the stored value can be converted back by the // transformer. diff --git a/chromium/chrome/browser/extensions/api/preference/preference_apitest.cc b/chromium/chrome/browser/extensions/api/preference/preference_apitest.cc index 69e7e5d0e07..631a0bb0dc4 100644 --- a/chromium/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chromium/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -13,8 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/lifetime/keep_alive_types.h" -#include "chrome/browser/lifetime/scoped_keep_alive.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -23,6 +21,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/keep_alive_registry/keep_alive_types.h" +#include "components/keep_alive_registry/scoped_keep_alive.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/common/safe_browsing_prefs.h" |