Change ownership of BookmarkClient

chrome/browser/bookmarks/chrome_bookmark_client.cc

 // Copyright 2014 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/bookmarks/chrome_bookmark_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 51 matching lines @@
 
 }  // namespace
 
 ChromeBookmarkClient::ChromeBookmarkClient(Profile* profile)
     : profile_(profile) {
 }
 
 ChromeBookmarkClient::~ChromeBookmarkClient() {
 }
 
-void ChromeBookmarkClient::Init(BookmarkModel* model) {
-  DCHECK(model);
+void ChromeBookmarkClient::Init(BookmarkModel* bookmark_model) {
+  DCHECK(bookmark_model);
   managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
-      model,
+      bookmark_model,
       profile_->GetPrefs(),
       false,
       base::Bind(&ChromeBookmarkClient::GetManagedBookmarksDomain,
                  base::Unretained(this))));
   supervised_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
-      model,
+      bookmark_model,
       profile_->GetPrefs(),
       true,
       base::Callback<std::string()>()));
 }
 
 base::CancelableTaskTracker::TaskId
 ChromeBookmarkClient::GetFaviconImageForPageURL(
     const GURL& page_url,
     favicon_base::IconType type,
     const favicon_base::FaviconImageCallback& callback,
@@ skipping 99 matching lines @@
   return extra_nodes.Pass();
 }
 
 std::string ChromeBookmarkClient::GetManagedBookmarksDomain() {
   policy::ProfilePolicyConnector* connector =
       policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile_);
   if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))
     return connector->GetManagementDomain();
   return std::string();
 }