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

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

Issue 300843013: Install and launch kiosk app from cached crx file at start up. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove the useless offline_enabled_app_profile testing data. Created 6 years, 5 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 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/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/prefs/testing_pref_service.h" 9 #include "base/prefs/testing_pref_service.h"
10 #include "base/test/scoped_path_override.h" 10 #include "base/test/scoped_path_override.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
12 #include "chrome/browser/chromeos/customization_document.h" 13 #include "chrome/browser/chromeos/customization_document.h"
13 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 14 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
14 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_service_test_base.h" 16 #include "chrome/browser/extensions/extension_service_test_base.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
18 #include "chrome/test/base/testing_browser_process.h" 19 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
20 #include "chromeos/system/mock_statistics_provider.h" 21 #include "chromeos/system/mock_statistics_provider.h"
21 #include "chromeos/system/statistics_provider.h" 22 #include "chromeos/system/statistics_provider.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 external_externsions_overrides_.reset(new base::ScopedPathOverride( 69 external_externsions_overrides_.reset(new base::ScopedPathOverride(
69 chrome::DIR_EXTERNAL_EXTENSIONS, data_dir().Append("external"))); 70 chrome::DIR_EXTERNAL_EXTENSIONS, data_dir().Append("external")));
70 71
71 chromeos::system::StatisticsProvider::SetTestProvider( 72 chromeos::system::StatisticsProvider::SetTestProvider(
72 &mock_statistics_provider_); 73 &mock_statistics_provider_);
73 EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull())) 74 EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull()))
74 .WillRepeatedly(Return(false)); 75 .WillRepeatedly(Return(false));
75 } 76 }
76 77
77 virtual void TearDown() OVERRIDE { 78 virtual void TearDown() OVERRIDE {
79 chromeos::KioskAppManager::Shutdown();
78 chromeos::system::StatisticsProvider::SetTestProvider(NULL); 80 chromeos::system::StatisticsProvider::SetTestProvider(NULL);
79 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); 81 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
80 } 82 }
81 83
82 private: 84 private:
83 TestingPrefServiceSimple local_state_; 85 TestingPrefServiceSimple local_state_;
84 scoped_ptr<base::ScopedPathOverride> external_externsions_overrides_; 86 scoped_ptr<base::ScopedPathOverride> external_externsions_overrides_;
85 chromeos::system::MockStatisticsProvider mock_statistics_provider_; 87 chromeos::system::MockStatisticsProvider mock_statistics_provider_;
86 chromeos::FakeUserManager* fake_user_manager_; 88 chromeos::FakeUserManager* fake_user_manager_;
87 chromeos::ScopedUserManagerEnabler scoped_user_manager_; 89 chromeos::ScopedUserManagerEnabler scoped_user_manager_;
(...skipping 23 matching lines...) Expand all
111 113
112 InitServiceWithExternalProviders(); 114 InitServiceWithExternalProviders();
113 115
114 service_->CheckForExternalUpdates(); 116 service_->CheckForExternalUpdates();
115 base::RunLoop().RunUntilIdle(); 117 base::RunLoop().RunUntilIdle();
116 118
117 EXPECT_FALSE(service_->GetInstalledExtension(kExternalAppId)); 119 EXPECT_FALSE(service_->GetInstalledExtension(kExternalAppId));
118 } 120 }
119 121
120 } // namespace extensions 122 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/external_provider_impl.cc ('k') | chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698