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

Side by Side Diff: chrome/browser/extensions/extension_incognito_apitest.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 "chrome/browser/extensions/browser_action_test_util.h" 5 #include "chrome/browser/extensions/browser_action_test_util.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_test_message_listener.h" 8 #include "chrome/browser/extensions/extension_test_message_listener.h"
9 #include "chrome/browser/extensions/user_script_master.h" 9 #include "chrome/browser/extensions/user_script_master.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "chrome/test/base/ui_test_utils.h" 15 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "net/base/mock_host_resolver.h" 18 #include "net/dns/mock_host_resolver.h"
19 19
20 using content::WebContents; 20 using content::WebContents;
21 21
22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) { 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) {
23 ASSERT_TRUE(StartTestServer()); 23 ASSERT_TRUE(StartTestServer());
24 24
25 // Loads a simple extension which attempts to change the title of every page 25 // Loads a simple extension which attempts to change the title of every page
26 // that loads to "modified". 26 // that loads to "modified".
27 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("incognito") 27 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("incognito")
28 .AppendASCII("content_scripts"))); 28 .AppendASCII("content_scripts")));
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Open incognito window and navigate to test page. 193 // Open incognito window and navigate to test page.
194 Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord( 194 Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
195 browser()->profile(), 195 browser()->profile(),
196 test_server()->GetURL("files/extensions/test_file.html")); 196 test_server()->GetURL("files/extensions/test_file.html"));
197 197
198 // Simulate the incognito's browser action being clicked. 198 // Simulate the incognito's browser action being clicked.
199 BrowserActionTestUtil(incognito_browser).Press(0); 199 BrowserActionTestUtil(incognito_browser).Press(0);
200 200
201 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 201 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
202 } 202 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698