Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/history/android/android_history_provider_service_unittest.cc

 // Copyright (c) 2012 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/history/android/android_history_provider_service.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 40 matching lines @@
     // Setup the testing profile, so the bookmark_model_sql_handler could
     // get the bookmark model from it.
     ASSERT_TRUE(profile_manager_.SetUp());
     // It seems that the name has to be chrome::kInitialProfile, so it
     // could be found by ProfileManager::GetLastUsedProfile().
     testing_profile_ = profile_manager_.CreateTestingProfile(
         chrome::kInitialProfile);
 
     testing_profile_->CreateBookmarkModel(true);
     bookmarks::test::WaitForBookmarkModelToLoad(
-        BookmarkModelFactory::GetForProfile(testing_profile_));
+        BookmarkModelFactory::GetForBrowserContext(testing_profile_));
     ASSERT_TRUE(testing_profile_->CreateHistoryService(true, false));
     service_.reset(new AndroidHistoryProviderService(testing_profile_));
   }
 
   void TearDown() override {
     testing_profile_->DestroyHistoryService();
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
-    testing_profile_=NULL;
+    testing_profile_ = nullptr;
   }
 
  protected:
   TestingProfileManager profile_manager_;
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   std::unique_ptr<AndroidHistoryProviderService> service_;
   base::CancelableTaskTracker cancelable_tracker_;
   TestingProfile* testing_profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderServiceTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
  public:
   CallbackHelper()
-      : success_(false),
-        statement_(NULL),
-        cursor_position_(0),
-        count_(0) {
-  }
+      : success_(false), statement_(nullptr), cursor_position_(0), count_(0) {}
 
   bool success() const {
     return success_;
   }
 
   AndroidStatement* statement() const {
     return statement_;
   }
 
   int cursor_position() const {
     return cursor_position_;
   }
 
   int count() const {
     return count_;
   }
 
   void OnInserted(int64_t id) {
     success_ = id != 0;
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void OnQueryResult(AndroidStatement* statement) {
-    success_ = statement != NULL;
+    success_ = statement != nullptr;
     statement_ = statement;
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void OnUpdated(int count) {
     success_ = count != 0;
     count_ = count;
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
@@ skipping 152 matching lines @@
   service_->DeleteSearchTerms(std::string(),
                               std::vector<base::string16>(),
                               Bind(&CallbackHelper::OnDeleted, callback.get()),
                               &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace