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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log
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 "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/prefs/pref_service.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/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.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 using namespace extensions; 18 using namespace extensions;
19 19
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 Manifest::INTERNAL, Extension::NO_FLAGS); 84 Manifest::INTERNAL, Extension::NO_FLAGS);
85 // The old default apps with kProvideLegacyDefaultApps should be migrated 85 // The old default apps with kProvideLegacyDefaultApps should be migrated
86 // even if the profile version is older than Chrome version. 86 // even if the profile version is older than Chrome version.
87 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, 87 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
88 default_apps::kProvideLegacyDefaultApps); 88 default_apps::kProvideLegacyDefaultApps);
89 EXPECT_TRUE(provider2.ShouldInstallInProfile()); 89 EXPECT_TRUE(provider2.ShouldInstallInProfile());
90 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); 90 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
91 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); 91 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
92 } 92 }
93 #endif 93 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/default_apps.cc ('k') | chrome/browser/extensions/extension_context_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698