OLD | NEW |
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/extensions/external_pref_loader.h" | 5 #include "chrome/browser/extensions/external_pref_loader.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/message_loop.h" |
8 #include "chrome/browser/extensions/default_apps.h" | 9 #include "chrome/browser/extensions/default_apps.h" |
9 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
10 #include "chrome/common/chrome_paths.h" | 11 #include "chrome/common/chrome_paths.h" |
11 #include "chrome/common/extensions/extension.h" | 12 #include "chrome/common/extensions/extension.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
14 #include "content/public/test/test_browser_thread.h" | 15 #include "content/public/test/test_browser_thread.h" |
15 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
16 | 17 |
17 using default_apps::Provider; | 18 using default_apps::Provider; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 Extension::INTERNAL, Extension::NO_FLAGS); | 85 Extension::INTERNAL, Extension::NO_FLAGS); |
85 // The old default apps with kProvideLegacyDefaultApps should be migrated | 86 // The old default apps with kProvideLegacyDefaultApps should be migrated |
86 // even if the profile version is older than Chrome version. | 87 // even if the profile version is older than Chrome version. |
87 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, | 88 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, |
88 default_apps::kProvideLegacyDefaultApps); | 89 default_apps::kProvideLegacyDefaultApps); |
89 EXPECT_TRUE(provider2.ShouldInstallInProfile()); | 90 EXPECT_TRUE(provider2.ShouldInstallInProfile()); |
90 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); | 91 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); |
91 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); | 92 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); |
92 } | 93 } |
93 #endif | 94 #endif |
OLD | NEW |