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

Side by Side Diff: chrome/browser/undo/bookmark_undo_service_test.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/undo/bookmark_undo_service.h" 5 #include "chrome/browser/undo/bookmark_undo_service.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 9 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
11 #include "components/bookmarks/browser/bookmark_model.h" 11 #include "components/bookmarks/browser/bookmark_model.h"
12 #include "components/bookmarks/test/bookmark_test_helpers.h" 12 #include "components/bookmarks/test/bookmark_test_helpers.h"
13 #include "content/public/test/test_browser_thread_bundle.h" 13 #include "content/public/test/test_browser_thread_bundle.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 using base::ASCIIToUTF16; 16 using base::ASCIIToUTF16;
17 17
18 namespace { 18 namespace {
19 19
20 class BookmarkUndoServiceTest : public testing::Test { 20 class BookmarkUndoServiceTest : public testing::Test {
21 public: 21 public:
22 BookmarkUndoServiceTest(); 22 BookmarkUndoServiceTest();
23 23
24 virtual void SetUp() OVERRIDE; 24 virtual void SetUp() override;
25 virtual void TearDown() OVERRIDE; 25 virtual void TearDown() override;
26 26
27 BookmarkModel* GetModel(); 27 BookmarkModel* GetModel();
28 BookmarkUndoService* GetUndoService(); 28 BookmarkUndoService* GetUndoService();
29 29
30 private: 30 private:
31 scoped_ptr<TestingProfile> profile_; 31 scoped_ptr<TestingProfile> profile_;
32 content::TestBrowserThreadBundle thread_bundle_; 32 content::TestBrowserThreadBundle thread_bundle_;
33 33
34 DISALLOW_COPY_AND_ASSIGN(BookmarkUndoServiceTest); 34 DISALLOW_COPY_AND_ASSIGN(BookmarkUndoServiceTest);
35 }; 35 };
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 while (undo_service->undo_manager()->undo_count()) 411 while (undo_service->undo_manager()->undo_count())
412 undo_service->undo_manager()->Undo(); 412 undo_service->undo_manager()->Undo();
413 413
414 EXPECT_EQ(1, parent->child_count()); 414 EXPECT_EQ(1, parent->child_count());
415 const BookmarkNode* node = model->other_node()->GetChild(0); 415 const BookmarkNode* node = model->other_node()->GetChild(0);
416 EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo")); 416 EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo"));
417 EXPECT_EQ(node->url(), GURL("http://www.foo.com")); 417 EXPECT_EQ(node->url(), GURL("http://www.foo.com"));
418 } 418 }
419 419
420 } // namespace 420 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/undo/bookmark_undo_service_factory.h ('k') | chrome/browser/undo/undo_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698