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

Side by Side Diff: chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. 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
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 <string> 5 #include <string>
6 6
7 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h" 10 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
16 #include "chrome/test/base/ui_test_utils.h" 15 #include "chrome/test/base/ui_test_utils.h"
17 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
18 #include "extensions/common/extension_set.h" 17 #include "extensions/browser/extension_registry.h"
19 #include "extensions/test/result_catcher.h" 18 #include "extensions/test/result_catcher.h"
20 #include "net/dns/mock_host_resolver.h" 19 #include "net/dns/mock_host_resolver.h"
21 20
22 namespace { 21 namespace {
23 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk"; 22 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk";
24 const char kPasswordFileForTest[] = "password-file-for-test"; 23 const char kPasswordFileForTest[] = "password-file-for-test";
25 const char kOverrideUserDataDir[] = "override-user-data-dir"; 24 const char kOverrideUserDataDir[] = "override-user-data-dir";
26 } // namespace 25 } // namespace
27 26
28 namespace extensions { 27 namespace extensions {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; 125 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
127 }; 126 };
128 127
129 // Test that a push can make a round trip through the servers. 128 // Test that a push can make a round trip through the servers.
130 // This test is disabled to keep it from running on trybots since 129 // This test is disabled to keep it from running on trybots since
131 // it requires network access, and it is not a good idea to run 130 // it requires network access, and it is not a good idea to run
132 // this test as part of a checkin or nightly test. 131 // this test as part of a checkin or nightly test.
133 IN_PROC_BROWSER_TEST_F(PushMessagingCanaryTest, MANUAL_ReceivesPush) { 132 IN_PROC_BROWSER_TEST_F(PushMessagingCanaryTest, MANUAL_ReceivesPush) {
134 InitializeSync(); 133 InitializeSync();
135 134
136 const ExtensionSet* installed_extensions = extension_service()->extensions(); 135 ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
137 if (!installed_extensions->Contains(kTestExtensionId)) { 136 if (!registry->enabled_extensions().GetByID(kTestExtensionId)) {
138 const Extension* extension = 137 const Extension* extension =
139 LoadExtension(test_data_dir_.AppendASCII("push_messaging_canary")); 138 LoadExtension(test_data_dir_.AppendASCII("push_messaging_canary"));
140 ASSERT_TRUE(extension); 139 ASSERT_TRUE(extension);
141 } 140 }
142 ASSERT_TRUE(installed_extensions->Contains(kTestExtensionId)); 141 ASSERT_TRUE(registry->enabled_extensions().GetByID(kTestExtensionId));
143 142
144 ResultCatcher catcher; 143 ResultCatcher catcher;
145 catcher.RestrictToBrowserContext(profile()); 144 catcher.RestrictToBrowserContext(profile());
146 145
147 const Extension* extension = 146 const Extension* extension =
148 extension_service()->extensions()->GetByID(kTestExtensionId); 147 registry->enabled_extensions().GetByID(kTestExtensionId);
149 ASSERT_TRUE(extension); 148 ASSERT_TRUE(extension);
150 ui_test_utils::NavigateToURL( 149 ui_test_utils::NavigateToURL(
151 browser(), extension->GetResourceURL("push_messaging_canary.html")); 150 browser(), extension->GetResourceURL("push_messaging_canary.html"));
152 151
153 const std::string& client_id = sync_setup_helper()->client_id(); 152 const std::string& client_id = sync_setup_helper()->client_id();
154 const std::string& client_secret = sync_setup_helper()->client_secret(); 153 const std::string& client_secret = sync_setup_helper()->client_secret();
155 const std::string& refresh_token = sync_setup_helper()->refresh_token(); 154 const std::string& refresh_token = sync_setup_helper()->refresh_token();
156 155
157 const base::string16& script_string = base::UTF8ToUTF16(base::StringPrintf( 156 const base::string16& script_string = base::UTF8ToUTF16(base::StringPrintf(
158 "startTestWithCredentials('%s', '%s', '%s');", 157 "startTestWithCredentials('%s', '%s', '%s');",
159 client_id.c_str(), client_secret.c_str(), refresh_token.c_str())); 158 client_id.c_str(), client_secret.c_str(), refresh_token.c_str()));
160 159
161 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()-> 160 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()->
162 ExecuteJavaScript(script_string); 161 ExecuteJavaScript(script_string);
163 162
164 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 163 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
165 } 164 }
166 165
167 } // namespace extensions 166 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698