Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / omnibox / location_bar.cc

diff --git a/src/chrome/browser/ui/omnibox/location_bar.cc b/src/chrome/browser/ui/omnibox/location_bar.cc
index 5f6d279..5f6b358 100644 (file)
--- a/src/chrome/browser/ui/omnibox/location_bar.cc
+++ b/src/chrome/browser/ui/omnibox/location_bar.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/ui/omnibox/location_bar.h"
 
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/permissions/permissions_data.h"
@@ -21,8 +21,7 @@ LocationBar::~LocationBar() {
 
 bool LocationBar::IsBookmarkStarHiddenByExtension() const {
   const ExtensionService* extension_service =
-      extensions::ExtensionSystem::GetForBrowserContext(
-          profile_)->extension_service();
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   // Extension service may be NULL during unit test execution.
   if (!extension_service)
     return false;
@@ -31,9 +30,11 @@ bool LocationBar::IsBookmarkStarHiddenByExtension() const {
       extension_service->extensions();
   for (extensions::ExtensionSet::const_iterator i = extension_set->begin();
        i != extension_set->end(); ++i) {
-    const extensions::SettingsOverrides* settings_overrides =
-        extensions::SettingsOverrides::Get(i->get());
-    if (settings_overrides && settings_overrides->RemovesBookmarkButton() &&
+    using extensions::SettingsOverrides;
+    const SettingsOverrides* settings_overrides =
+        SettingsOverrides::Get(i->get());
+    if (settings_overrides &&
+        SettingsOverrides::RemovesBookmarkButton(*settings_overrides) &&
         (extensions::PermissionsData::HasAPIPermission(
             *i,
             extensions::APIPermission::kBookmarkManagerPrivate) ||