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

Side by Side Diff: chrome/browser/extensions/default_apps_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 (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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/extensions/default_apps.h" 8 #include "chrome/browser/extensions/default_apps.h"
9 #include "chrome/browser/extensions/external_pref_loader.h" 9 #include "chrome/browser/extensions/external_pref_loader.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "content/public/test/test_browser_thread.h" 13 #include "content/public/test/test_browser_thread.h"
14 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using default_apps::Provider; 17 using default_apps::Provider;
18 18
19 namespace extensions { 19 namespace extensions {
20 20
21 class MockExternalLoader : public ExternalLoader { 21 class MockExternalLoader : public ExternalLoader {
22 public: 22 public:
23 MockExternalLoader() {} 23 MockExternalLoader() {}
24 24
25 virtual void StartLoading() OVERRIDE {} 25 virtual void StartLoading() override {}
26 private: 26 private:
27 virtual ~MockExternalLoader() {} 27 virtual ~MockExternalLoader() {}
28 }; 28 };
29 29
30 class DefaultAppsTest : public testing::Test { 30 class DefaultAppsTest : public testing::Test {
31 public: 31 public:
32 DefaultAppsTest() : ui_thread_(content::BrowserThread::UI, &loop_) {} 32 DefaultAppsTest() : ui_thread_(content::BrowserThread::UI, &loop_) {}
33 virtual ~DefaultAppsTest() {} 33 virtual ~DefaultAppsTest() {}
34 private: 34 private:
35 base::MessageLoopForIO loop_; 35 base::MessageLoopForIO loop_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 // The old default apps with kAlwaysInstallDefaultAppss should be migrated. 68 // The old default apps with kAlwaysInstallDefaultAppss should be migrated.
69 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, 69 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
70 default_apps::kProvideLegacyDefaultApps); 70 default_apps::kProvideLegacyDefaultApps);
71 EXPECT_TRUE(provider.ShouldInstallInProfile()); 71 EXPECT_TRUE(provider.ShouldInstallInProfile());
72 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); 72 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
73 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); 73 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
74 74
75 class DefaultTestingProfile : public TestingProfile { 75 class DefaultTestingProfile : public TestingProfile {
76 virtual bool WasCreatedByVersionOrLater( 76 virtual bool WasCreatedByVersionOrLater(
77 const std::string& version) OVERRIDE { 77 const std::string& version) override {
78 return false; 78 return false;
79 } 79 }
80 }; 80 };
81 profile.reset(new DefaultTestingProfile); 81 profile.reset(new DefaultTestingProfile);
82 Provider provider2(profile.get(), NULL, loader, Manifest::INTERNAL, 82 Provider provider2(profile.get(), NULL, loader, Manifest::INTERNAL,
83 Manifest::INTERNAL, Extension::NO_FLAGS); 83 Manifest::INTERNAL, Extension::NO_FLAGS);
84 // The old default apps with kProvideLegacyDefaultApps should be migrated 84 // The old default apps with kProvideLegacyDefaultApps should be migrated
85 // even if the profile version is older than Chrome version. 85 // even if the profile version is older than Chrome version.
86 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, 86 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
87 default_apps::kProvideLegacyDefaultApps); 87 default_apps::kProvideLegacyDefaultApps);
88 EXPECT_TRUE(provider2.ShouldInstallInProfile()); 88 EXPECT_TRUE(provider2.ShouldInstallInProfile());
89 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); 89 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
90 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); 90 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
91 } 91 }
92 #endif 92 #endif
93 93
94 } // namespace extensions 94 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/default_apps.h ('k') | chrome/browser/extensions/dev_mode_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698