Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(625)

Side by Side Diff: chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/history/android/bookmark_model_sql_handler.h" 5 #include "chrome/browser/history/android/bookmark_model_sql_handler.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/synchronization/waitable_event.h" 8 #include "base/synchronization/waitable_event.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/history/history_database.h" 10 #include "chrome/browser/history/history_database.h"
(...skipping 18 matching lines...) Expand all
29 BookmarkModelSQLHandlerTest() 29 BookmarkModelSQLHandlerTest()
30 : profile_manager_( 30 : profile_manager_(
31 TestingBrowserProcess::GetGlobal()), 31 TestingBrowserProcess::GetGlobal()),
32 bookmark_model_(NULL), 32 bookmark_model_(NULL),
33 ui_thread_(BrowserThread::UI, &message_loop_), 33 ui_thread_(BrowserThread::UI, &message_loop_),
34 file_thread_(BrowserThread::FILE, &message_loop_) { 34 file_thread_(BrowserThread::FILE, &message_loop_) {
35 } 35 }
36 virtual ~BookmarkModelSQLHandlerTest() {} 36 virtual ~BookmarkModelSQLHandlerTest() {}
37 37
38 protected: 38 protected:
39 virtual void SetUp() OVERRIDE { 39 virtual void SetUp() override {
40 // Setup the testing profile, so the bookmark_model_sql_handler could 40 // Setup the testing profile, so the bookmark_model_sql_handler could
41 // get the bookmark model from it. 41 // get the bookmark model from it.
42 ASSERT_TRUE(profile_manager_.SetUp()); 42 ASSERT_TRUE(profile_manager_.SetUp());
43 // It seems that the name has to be chrome::kInitialProfile, so it 43 // It seems that the name has to be chrome::kInitialProfile, so it
44 // could be found by ProfileManager::GetLastUsedProfile(). 44 // could be found by ProfileManager::GetLastUsedProfile().
45 TestingProfile* testing_profile = profile_manager_.CreateTestingProfile( 45 TestingProfile* testing_profile = profile_manager_.CreateTestingProfile(
46 chrome::kInitialProfile); 46 chrome::kInitialProfile);
47 // Create the BookmarkModel that doesn't need to invoke load(). 47 // Create the BookmarkModel that doesn't need to invoke load().
48 testing_profile->CreateBookmarkModel(true); 48 testing_profile->CreateBookmarkModel(true);
49 bookmark_model_ = BookmarkModelFactory::GetForProfile(testing_profile); 49 bookmark_model_ = BookmarkModelFactory::GetForProfile(testing_profile);
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 id_row.url = url1; 244 id_row.url = url1;
245 id_rows.clear(); 245 id_rows.clear();
246 id_rows.push_back(id_row); 246 id_rows.push_back(id_row);
247 ASSERT_TRUE(handler.Delete(id_rows)); 247 ASSERT_TRUE(handler.Delete(id_rows));
248 RunMessageLoopForUI(); 248 RunMessageLoopForUI();
249 // All bookmarks were deleted. 249 // All bookmarks were deleted.
250 EXPECT_FALSE(bookmark_model_->HasBookmarks()); 250 EXPECT_FALSE(bookmark_model_->HasBookmarks());
251 } 251 }
252 252
253 } // namespace history 253 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/android/bookmark_model_sql_handler.h ('k') | chrome/browser/history/android/favicon_sql_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698