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

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

Issue 2657823005: Move //c/b/services/gcm/ to //c/b/gcm/ (Closed)
Patch Set: Created 3 years, 11 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 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "chrome/browser/extensions/api/instance_id/instance_id_api.h" 10 #include "chrome/browser/extensions/api/instance_id/instance_id_api.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_gcm_app_handler.h" 12 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
13 #include "chrome/browser/gcm/fake_gcm_profile_service.h"
14 #include "chrome/browser/gcm/gcm_profile_service_factory.h"
15 #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
13 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
15 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
16 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_fa ctory.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h" 18 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
19 #include "components/version_info/version_info.h" 19 #include "components/version_info/version_info.h"
20 #include "extensions/test/result_catcher.h" 20 #include "extensions/test/result_catcher.h"
21 21
22 using extensions::ResultCatcher; 22 using extensions::ResultCatcher;
23 23
24 namespace extensions { 24 namespace extensions {
25 25
26 class InstanceIDApiTest : public ExtensionApiTest { 26 class InstanceIDApiTest : public ExtensionApiTest {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 incognito_catcher.RestrictToBrowserContext( 71 incognito_catcher.RestrictToBrowserContext(
72 profile()->GetOffTheRecordProfile()); 72 profile()->GetOffTheRecordProfile());
73 73
74 ASSERT_TRUE(RunExtensionTestIncognito("instance_id/incognito")); 74 ASSERT_TRUE(RunExtensionTestIncognito("instance_id/incognito"));
75 75
76 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 76 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
77 EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message(); 77 EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
78 } 78 }
79 79
80 } // namespace extensions 80 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/instance_id/instance_id_api.cc ('k') | chrome/browser/extensions/extension_gcm_app_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698