chrome/browser/extensions/api/instance_id/instance_id_apitest.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

Side by Side Diff: chrome/browser/extensions/api/instance_id/instance_id_apitest.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 4 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

« no previous file with comments | « chrome/browser/extensions/api/idltest/idltest_apitest.cc ('k') | chrome/browser/extensions/api/messaging/native_message_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/run_loop.h"	6 #include "base/run_loop.h"

7 #include "chrome/browser/extensions/api/instance_id/instance_id_api.h"	7 #include "chrome/browser/extensions/api/instance_id/instance_id_api.h"

8 #include "chrome/browser/extensions/extension_apitest.h"	8 #include "chrome/browser/extensions/extension_apitest.h"

9 #include "chrome/browser/extensions/extension_gcm_app_handler.h"	9 #include "chrome/browser/extensions/extension_gcm_app_handler.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"	11 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"

12 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"	12 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

13 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_fa ctory.h"	13 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_fa ctory.h"

14 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

15 #include "chrome/common/extensions/features/feature_channel.h"	15 #include "chrome/common/extensions/features/feature_channel.h"

16 #include "chrome/test/base/ui_test_utils.h"	16 #include "chrome/test/base/ui_test_utils.h"

17 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"	17 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"

	18 #include "components/version_info/version_info.h"

18 #include "extensions/test/result_catcher.h"	19 #include "extensions/test/result_catcher.h"

19	20

20 using extensions::ResultCatcher;	21 using extensions::ResultCatcher;

21	22

22 namespace extensions {	23 namespace extensions {

23	24

24 namespace {	25 namespace {

25	26

26 scoped_ptr<KeyedService> BuildFakeGCMProfileService(	27 scoped_ptr<KeyedService> BuildFakeGCMProfileService(

27 content::BrowserContext* context) {	28 content::BrowserContext* context) {

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105 ASSERT_TRUE(RunExtensionTest("instance_id/channel"));	106 ASSERT_TRUE(RunExtensionTest("instance_id/channel"));

106 }	107 }

107	108

108 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, StableChannel) {	109 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, StableChannel) {

109 extensions::ScopedCurrentChannel current_channel_override(	110 extensions::ScopedCurrentChannel current_channel_override(

110 version_info::Channel::STABLE);	111 version_info::Channel::STABLE);

111 ASSERT_TRUE(RunExtensionTest("instance_id/channel"));	112 ASSERT_TRUE(RunExtensionTest("instance_id/channel"));

112 }	113 }

113	114

114 } // namespace extensions	115 } // namespace extensions

OLD	NEW