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

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

Issue 650763003: Delay default apps installation on Chrome OS for first time sign-in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ScopedObserver Created 6 years, 1 month 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
« no previous file with comments | « chrome/browser/extensions/external_provider_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_provider_impl.h" 5 #include "chrome/browser/extensions/external_provider_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/prefs/testing_pref_service.h" 12 #include "base/prefs/testing_pref_service.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/test/scoped_path_override.h" 14 #include "base/test/scoped_path_override.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/extensions/extension_service.h" 16 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/extensions/extension_service_test_base.h" 17 #include "chrome/browser/extensions/extension_service_test_base.h"
18 #include "chrome/browser/extensions/updater/extension_cache_fake.h" 18 #include "chrome/browser/extensions/updater/extension_cache_fake.h"
19 #include "chrome/browser/extensions/updater/extension_updater.h" 19 #include "chrome/browser/extensions/updater/extension_updater.h"
20 #include "chrome/common/chrome_constants.h"
20 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/extensions/extension_constants.h" 23 #include "chrome/common/extensions/extension_constants.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 #include "chrome/test/base/testing_browser_process.h" 25 #include "chrome/test/base/testing_browser_process.h"
25 #include "chrome/test/base/testing_profile.h" 26 #include "chrome/test/base/testing_profile.h"
26 #include "content/public/browser/notification_service.h" 27 #include "content/public/browser/notification_service.h"
27 #include "content/public/test/test_utils.h" 28 #include "content/public/test/test_utils.h"
28 #include "net/test/embedded_test_server/embedded_test_server.h" 29 #include "net/test/embedded_test_server/embedded_test_server.h"
29 #include "net/test/embedded_test_server/http_request.h" 30 #include "net/test/embedded_test_server/http_request.h"
(...skipping 24 matching lines...) Expand all
54 class ExternalProviderImplTest : public ExtensionServiceTestBase { 55 class ExternalProviderImplTest : public ExtensionServiceTestBase {
55 public: 56 public:
56 ExternalProviderImplTest() {} 57 ExternalProviderImplTest() {}
57 virtual ~ExternalProviderImplTest() {} 58 virtual ~ExternalProviderImplTest() {}
58 59
59 void InitServiceWithExternalProviders() { 60 void InitServiceWithExternalProviders() {
60 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
61 chromeos::ScopedUserManagerEnabler scoped_user_manager( 62 chromeos::ScopedUserManagerEnabler scoped_user_manager(
62 new chromeos::FakeUserManager); 63 new chromeos::FakeUserManager);
63 #endif 64 #endif
64 InitializeExtensionServiceWithUpdater(); 65 InitializeExtensionServiceWithUpdaterAndPrefs();
65 66
66 service()->updater()->SetExtensionCacheForTesting( 67 service()->updater()->SetExtensionCacheForTesting(
67 test_extension_cache_.get()); 68 test_extension_cache_.get());
68 69
69 // Don't install default apps. Some of the default apps are downloaded from 70 // Don't install default apps. Some of the default apps are downloaded from
70 // the webstore, ignoring the url we pass to kAppsGalleryUpdateURL, which 71 // the webstore, ignoring the url we pass to kAppsGalleryUpdateURL, which
71 // would cause the external updates to never finish install. 72 // would cause the external updates to never finish install.
72 profile_->GetPrefs()->SetString(prefs::kDefaultApps, ""); 73 profile_->GetPrefs()->SetString(prefs::kDefaultApps, "");
73 74
74 ProviderCollection providers; 75 ProviderCollection providers;
75 extensions::ExternalProviderImpl::CreateExternalProviders( 76 extensions::ExternalProviderImpl::CreateExternalProviders(
76 service_, profile_.get(), &providers); 77 service_, profile_.get(), &providers);
77 78
78 for (ProviderCollection::iterator i = providers.begin(); 79 for (ProviderCollection::iterator i = providers.begin();
79 i != providers.end(); 80 i != providers.end();
80 ++i) { 81 ++i) {
81 service_->AddProviderForTesting(i->release()); 82 service_->AddProviderForTesting(i->release());
82 } 83 }
83 } 84 }
84 85
86 void InitializeExtensionServiceWithUpdaterAndPrefs() {
87 ExtensionServiceInitParams params = CreateDefaultInitParams();
88 params.autoupdate_enabled = true;
89 // Create prefs file to make the profile not new.
90 const char prefs[] = "{}";
91 EXPECT_EQ(base::WriteFile(params.pref_file, prefs, sizeof(prefs)),
92 int(sizeof(prefs)));
93 InitializeExtensionService(params);
94 service_->updater()->Start();
95 }
96
85 // ExtensionServiceTestBase overrides: 97 // ExtensionServiceTestBase overrides:
86 virtual void SetUp() override { 98 virtual void SetUp() override {
87 ExtensionServiceTestBase::SetUp(); 99 ExtensionServiceTestBase::SetUp();
88 test_server_.reset(new EmbeddedTestServer()); 100 test_server_.reset(new EmbeddedTestServer());
89 101
90 #if defined(OS_CHROMEOS) 102 #if defined(OS_CHROMEOS)
91 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); 103 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
92 chromeos::ServicesCustomizationDocument::RegisterPrefs( 104 chromeos::ServicesCustomizationDocument::RegisterPrefs(
93 local_state_.registry()); 105 local_state_.registry());
94 #endif 106 #endif
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 service_->CheckForExternalUpdates(); 182 service_->CheckForExternalUpdates();
171 runner->Run(); 183 runner->Run();
172 184
173 EXPECT_TRUE(service_->GetInstalledExtension( 185 EXPECT_TRUE(service_->GetInstalledExtension(
174 extension_misc::kInAppPaymentsSupportAppId)); 186 extension_misc::kInAppPaymentsSupportAppId));
175 EXPECT_TRUE(service_->IsExtensionEnabled( 187 EXPECT_TRUE(service_->IsExtensionEnabled(
176 extension_misc::kInAppPaymentsSupportAppId)); 188 extension_misc::kInAppPaymentsSupportAppId));
177 } 189 }
178 190
179 } // namespace extensions 191 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/external_provider_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698