Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

 // Copyright 2015 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/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
-#include "chrome/browser/profiles/profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 namespace extensions {
 
 namespace {
 
 const char kInvalidTypeOfParameter[] = "Attribute '%s' has an invalid type";
 const char kIsBookmarkedRequiresBookmarkPermission[] =
@@ skipping 98 matching lines @@
       IsCurrentUrlBookmarked() != is_url_bookmarked_;
   if (state_changed)
     is_url_bookmarked_ = !is_url_bookmarked_;
   if (state_changed || request_evaluation_if_unchanged)
     request_evaluation_.Run(web_contents());
 }
 
 bool DeclarativeContentIsBookmarkedConditionTracker::PerWebContentsTracker::
 IsCurrentUrlBookmarked() {
   bookmarks::BookmarkModel* bookmark_model =
-      BookmarkModelFactory::GetForProfile(
-          Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
+      BookmarkModelFactory::GetForBrowserContext(
+          web_contents()->GetBrowserContext());
   // BookmarkModel can be null during unit test execution.
   return bookmark_model &&
       bookmark_model->IsBookmarked(web_contents()->GetVisibleURL());
 }
 
 void DeclarativeContentIsBookmarkedConditionTracker::PerWebContentsTracker::
 WebContentsDestroyed() {
   web_contents_destroyed_.Run(web_contents());
 }
 
 //
 // DeclarativeContentIsBookmarkedConditionTracker
 //
 
 DeclarativeContentIsBookmarkedConditionTracker::
 DeclarativeContentIsBookmarkedConditionTracker(content::BrowserContext* context,
                                                Delegate* delegate)
     : delegate_(delegate),
       extensive_bookmark_changes_in_progress_(0),
       scoped_bookmarks_observer_(this) {
   bookmarks::BookmarkModel* bookmark_model =
-      BookmarkModelFactory::GetForProfile(Profile::FromBrowserContext(context));
+      BookmarkModelFactory::GetForBrowserContext(context);
   // Can be null during unit test execution.
   if (bookmark_model)
     scoped_bookmarks_observer_.Add(bookmark_model);
 }
 
 DeclarativeContentIsBookmarkedConditionTracker::
 ~DeclarativeContentIsBookmarkedConditionTracker() {
 }
 
 std::string DeclarativeContentIsBookmarkedConditionTracker::
@@ skipping 112 matching lines @@
   per_web_contents_tracker_.erase(contents);
 }
 
 void DeclarativeContentIsBookmarkedConditionTracker::
 UpdateAllPerWebContentsTrackers() {
   for (const auto& web_contents_tracker_pair : per_web_contents_tracker_)
     web_contents_tracker_pair.second->UpdateState(false);
 }
 
 }  // namespace extensions