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

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

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 (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/string16.h" 7 #include "base/string16.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/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" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/extensions/extension_set.h" 16 #include "chrome/common/extensions/extension_set.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
19 #include "net/base/mock_host_resolver.h" 19 #include "net/dns/mock_host_resolver.h"
20 20
21 namespace { 21 namespace {
22 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk"; 22 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk";
23 const char kPasswordFileForTest[] = "password-file-for-test"; 23 const char kPasswordFileForTest[] = "password-file-for-test";
24 const char kOverrideUserDataDir[] = "override-user-data-dir"; 24 const char kOverrideUserDataDir[] = "override-user-data-dir";
25 } // namespace 25 } // namespace
26 26
27 namespace extensions { 27 namespace extensions {
28 28
29 // This class provides tests specific to the push messaging 29 // This class provides tests specific to the push messaging
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 "startTestWithCredentials('%s', '%s', '%s');", 160 "startTestWithCredentials('%s', '%s', '%s');",
161 client_id.c_str(), client_secret.c_str(), refresh_token.c_str())); 161 client_id.c_str(), client_secret.c_str(), refresh_token.c_str()));
162 162
163 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost()-> 163 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost()->
164 ExecuteJavascriptInWebFrame(string16(), script_string); 164 ExecuteJavascriptInWebFrame(string16(), script_string);
165 165
166 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 166 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
167 } 167 }
168 168
169 } // namespace extensions 169 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698