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

Side by Side Diff: chrome/browser/extensions/bookmark_app_helper_unittest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/extensions/bookmark_app_helper.h" 5 #include "chrome/browser/extensions/bookmark_app_helper.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_service_test_base.h" 9 #include "chrome/browser/extensions/extension_service_test_base.h"
10 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 10 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
(...skipping 29 matching lines...) Expand all
40 private: 40 private:
41 DISALLOW_COPY_AND_ASSIGN(BookmarkAppHelperTest); 41 DISALLOW_COPY_AND_ASSIGN(BookmarkAppHelperTest);
42 }; 42 };
43 43
44 class BookmarkAppHelperExtensionServiceTest 44 class BookmarkAppHelperExtensionServiceTest
45 : public extensions::ExtensionServiceTestBase { 45 : public extensions::ExtensionServiceTestBase {
46 public: 46 public:
47 BookmarkAppHelperExtensionServiceTest() {} 47 BookmarkAppHelperExtensionServiceTest() {}
48 virtual ~BookmarkAppHelperExtensionServiceTest() {} 48 virtual ~BookmarkAppHelperExtensionServiceTest() {}
49 49
50 virtual void SetUp() OVERRIDE { 50 virtual void SetUp() override {
51 extensions::ExtensionServiceTestBase::SetUp(); 51 extensions::ExtensionServiceTestBase::SetUp();
52 InitializeEmptyExtensionService(); 52 InitializeEmptyExtensionService();
53 service_->Init(); 53 service_->Init();
54 EXPECT_EQ(0u, service_->extensions()->size()); 54 EXPECT_EQ(0u, service_->extensions()->size());
55 } 55 }
56 56
57 virtual void TearDown() OVERRIDE { 57 virtual void TearDown() override {
58 ExtensionServiceTestBase::TearDown(); 58 ExtensionServiceTestBase::TearDown();
59 for (content::RenderProcessHost::iterator i( 59 for (content::RenderProcessHost::iterator i(
60 content::RenderProcessHost::AllHostsIterator()); 60 content::RenderProcessHost::AllHostsIterator());
61 !i.IsAtEnd(); 61 !i.IsAtEnd();
62 i.Advance()) { 62 i.Advance()) {
63 content::RenderProcessHost* host = i.GetCurrentValue(); 63 content::RenderProcessHost* host = i.GetCurrentValue();
64 if (Profile::FromBrowserContext(host->GetBrowserContext()) == 64 if (Profile::FromBrowserContext(host->GetBrowserContext()) ==
65 profile_.get()) 65 profile_.get())
66 host->Cleanup(); 66 host->Cleanup();
67 } 67 }
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 326 }
327 327
328 TEST_F(BookmarkAppHelperTest, IsValidBookmarkAppUrl) { 328 TEST_F(BookmarkAppHelperTest, IsValidBookmarkAppUrl) {
329 EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("https://www.chromium.org"))); 329 EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("https://www.chromium.org")));
330 EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("http://www.chromium.org/path"))); 330 EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("http://www.chromium.org/path")));
331 EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("ftp://www.chromium.org"))); 331 EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("ftp://www.chromium.org")));
332 EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("chrome://flags"))); 332 EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("chrome://flags")));
333 } 333 }
334 334
335 } // namespace extensions 335 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/bookmark_app_helper.cc ('k') | chrome/browser/extensions/browser_extension_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698