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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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"
8 #include "build/build_config.h" 7 #include "build/build_config.h"
9 #include "chrome/browser/extensions/default_apps.h" 8 #include "chrome/browser/extensions/default_apps.h"
10 #include "chrome/browser/extensions/external_pref_loader.h" 9 #include "chrome/browser/extensions/external_pref_loader.h"
11 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
12 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
13 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "components/prefs/pref_service.h"
14 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.h"
15 #include "extensions/common/extension.h" 15 #include "extensions/common/extension.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using default_apps::Provider; 18 using default_apps::Provider;
19 19
20 namespace extensions { 20 namespace extensions {
21 21
22 class MockExternalLoader : public ExternalLoader { 22 class MockExternalLoader : public ExternalLoader {
23 public: 23 public:
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // even if the profile version is older than Chrome version. 87 // even if the profile version is older than Chrome version.
88 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, 88 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
89 default_apps::kProvideLegacyDefaultApps); 89 default_apps::kProvideLegacyDefaultApps);
90 EXPECT_TRUE(provider2.ShouldInstallInProfile()); 90 EXPECT_TRUE(provider2.ShouldInstallInProfile());
91 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); 91 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
92 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); 92 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
93 } 93 }
94 #endif 94 #endif
95 95
96 } // namespace extensions 96 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/default_apps.cc ('k') | chrome/browser/extensions/error_console/error_console.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698