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

Side by Side Diff: chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.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 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "chrome/browser/chromeos/profiles/profile_helper.h" 8 #include "chrome/browser/chromeos/profiles/profile_helper.h"
9 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 9 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 ProfileInvalidationProviderFactory::GetInstance()-> 45 ProfileInvalidationProviderFactory::GetInstance()->
46 GetServiceForBrowserContext(profile, false)); 46 GetServiceForBrowserContext(profile, false));
47 } 47 }
48 48
49 class ProfileInvalidationProviderFactoryLoginScreenBrowserTest 49 class ProfileInvalidationProviderFactoryLoginScreenBrowserTest
50 : public ProfileInvalidationProviderFactoryTestBase { 50 : public ProfileInvalidationProviderFactoryTestBase {
51 protected: 51 protected:
52 ProfileInvalidationProviderFactoryLoginScreenBrowserTest(); 52 ProfileInvalidationProviderFactoryLoginScreenBrowserTest();
53 virtual ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest(); 53 virtual ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest();
54 54
55 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 55 virtual void SetUpCommandLine(CommandLine* command_line) override;
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN( 58 DISALLOW_COPY_AND_ASSIGN(
59 ProfileInvalidationProviderFactoryLoginScreenBrowserTest); 59 ProfileInvalidationProviderFactoryLoginScreenBrowserTest);
60 }; 60 };
61 61
62 ProfileInvalidationProviderFactoryLoginScreenBrowserTest:: 62 ProfileInvalidationProviderFactoryLoginScreenBrowserTest::
63 ProfileInvalidationProviderFactoryLoginScreenBrowserTest() { 63 ProfileInvalidationProviderFactoryLoginScreenBrowserTest() {
64 } 64 }
65 65
(...skipping 15 matching lines...) Expand all
81 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile(); 81 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
82 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile)); 82 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
83 } 83 }
84 84
85 class ProfileInvalidationProviderFactoryGuestBrowserTest 85 class ProfileInvalidationProviderFactoryGuestBrowserTest
86 : public ProfileInvalidationProviderFactoryTestBase { 86 : public ProfileInvalidationProviderFactoryTestBase {
87 protected: 87 protected:
88 ProfileInvalidationProviderFactoryGuestBrowserTest(); 88 ProfileInvalidationProviderFactoryGuestBrowserTest();
89 virtual ~ProfileInvalidationProviderFactoryGuestBrowserTest(); 89 virtual ~ProfileInvalidationProviderFactoryGuestBrowserTest();
90 90
91 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 91 virtual void SetUpCommandLine(CommandLine* command_line) override;
92 92
93 private: 93 private:
94 DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryGuestBrowserTest); 94 DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryGuestBrowserTest);
95 }; 95 };
96 96
97 ProfileInvalidationProviderFactoryGuestBrowserTest:: 97 ProfileInvalidationProviderFactoryGuestBrowserTest::
98 ProfileInvalidationProviderFactoryGuestBrowserTest() { 98 ProfileInvalidationProviderFactoryGuestBrowserTest() {
99 } 99 }
100 100
101 ProfileInvalidationProviderFactoryGuestBrowserTest:: 101 ProfileInvalidationProviderFactoryGuestBrowserTest::
(...skipping 19 matching lines...) Expand all
121 chromeos::ProfileHelper::Get() 121 chromeos::ProfileHelper::Get()
122 ->GetProfileByUserUnsafe(user_manager->GetActiveUser()) 122 ->GetProfileByUserUnsafe(user_manager->GetActiveUser())
123 ->GetOriginalProfile(); 123 ->GetOriginalProfile();
124 Profile* login_profile = 124 Profile* login_profile =
125 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile(); 125 chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
126 EXPECT_FALSE(CanConstructProfileInvalidationProvider(guest_profile)); 126 EXPECT_FALSE(CanConstructProfileInvalidationProvider(guest_profile));
127 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile)); 127 EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
128 } 128 }
129 129
130 } // namespace invalidation 130 } // namespace invalidation
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698