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

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

Issue 2799883003: Switch from TestBrowserThread to TestBrowserThreadBundle in chrome. (Closed)
Patch Set: fix-string Created 3 years, 7 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 "chrome/browser/extensions/default_apps.h" 5 #include "chrome/browser/extensions/default_apps.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/message_loop/message_loop.h"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/extensions/external_pref_loader.h" 10 #include "chrome/browser/extensions/external_pref_loader.h"
12 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
15 #include "components/prefs/pref_service.h" 14 #include "components/prefs/pref_service.h"
16 #include "content/public/test/test_browser_thread.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
17 #include "extensions/common/extension.h" 16 #include "extensions/common/extension.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 18
20 using default_apps::Provider; 19 using default_apps::Provider;
21 20
22 namespace extensions { 21 namespace extensions {
23 22
24 class MockExternalLoader : public ExternalLoader { 23 class MockExternalLoader : public ExternalLoader {
25 public: 24 public:
26 MockExternalLoader() {} 25 MockExternalLoader() {}
27 26
28 void StartLoading() override {} 27 void StartLoading() override {}
29 28
30 private: 29 private:
31 ~MockExternalLoader() override {} 30 ~MockExternalLoader() override {}
32 }; 31 };
33 32
34 class DefaultAppsTest : public testing::Test { 33 class DefaultAppsTest : public testing::Test {
35 public: 34 public:
36 DefaultAppsTest() : ui_thread_(content::BrowserThread::UI, &loop_) {} 35 DefaultAppsTest()
36 : test_browser_thread_bundle_(
37 content::TestBrowserThreadBundle::IO_MAINLOOP) {}
37 ~DefaultAppsTest() override {} 38 ~DefaultAppsTest() override {}
38 39
39 private: 40 private:
40 base::MessageLoopForIO loop_; 41 content::TestBrowserThreadBundle test_browser_thread_bundle_;
41 content::TestBrowserThread ui_thread_;
42 }; 42 };
43 43
44 #if !defined(OS_CHROMEOS) 44 #if !defined(OS_CHROMEOS)
45 // Chrome OS has different way of installing default apps. 45 // Chrome OS has different way of installing default apps.
46 // Android does not currently support installing apps via Chrome. 46 // Android does not currently support installing apps via Chrome.
47 TEST_F(DefaultAppsTest, Install) { 47 TEST_F(DefaultAppsTest, Install) {
48 std::unique_ptr<TestingProfile> profile(new TestingProfile()); 48 std::unique_ptr<TestingProfile> profile(new TestingProfile());
49 ExternalLoader* loader = new MockExternalLoader(); 49 ExternalLoader* loader = new MockExternalLoader();
50 50
51 Provider provider(profile.get(), NULL, loader, Manifest::INTERNAL, 51 Provider provider(profile.get(), NULL, loader, Manifest::INTERNAL,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // even if the profile version is older than Chrome version. 89 // even if the profile version is older than Chrome version.
90 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState, 90 profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
91 default_apps::kProvideLegacyDefaultApps); 91 default_apps::kProvideLegacyDefaultApps);
92 EXPECT_TRUE(provider2.ShouldInstallInProfile()); 92 EXPECT_TRUE(provider2.ShouldInstallInProfile());
93 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState); 93 state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
94 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps); 94 EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
95 } 95 }
96 #endif 96 #endif
97 97
98 } // namespace extensions 98 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_info_map_unittest.cc ('k') | chrome/browser/extensions/extension_web_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698