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

Side by Side Diff: chrome/browser/search_engines/template_url_scraper_unittest.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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
6 #include "chrome/browser/search_engines/template_url_service.h" 7 #include "chrome/browser/search_engines/template_url_service.h"
7 #include "chrome/browser/search_engines/template_url_service_factory.h" 8 #include "chrome/browser/search_engines/template_url_service_factory.h"
8 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
14 #include "content/public/browser/notification_source.h" 14 #include "content/public/browser/notification_source.h"
15 #include "net/base/mock_host_resolver.h"
16 #include "net/base/net_util.h" 15 #include "net/base/net_util.h"
16 #include "net/dns/mock_host_resolver.h"
17 17
18 namespace { 18 namespace {
19 class TemplateURLScraperTest : public InProcessBrowserTest { 19 class TemplateURLScraperTest : public InProcessBrowserTest {
20 public: 20 public:
21 TemplateURLScraperTest() { 21 TemplateURLScraperTest() {
22 } 22 }
23 23
24 private: 24 private:
25 DISALLOW_COPY_AND_ASSIGN(TemplateURLScraperTest); 25 DISALLOW_COPY_AND_ASSIGN(TemplateURLScraperTest);
26 }; 26 };
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 HTTPTestServer::CreateServerWithFileRootURL( 79 HTTPTestServer::CreateServerWithFileRootURL(
80 L"chrome/test/data/template_url_scraper/submit_handler", L"/", 80 L"chrome/test/data/template_url_scraper/submit_handler", L"/",
81 g_browser_process->io_thread()->message_loop())); 81 g_browser_process->io_thread()->message_loop()));
82 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( 82 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
83 browser(), GURL("http://www.foo.com:1337/"), 2); 83 browser(), GURL("http://www.foo.com:1337/"), 2);
84 84
85 all_urls = template_urls->GetTemplateURLs(); 85 all_urls = template_urls->GetTemplateURLs();
86 EXPECT_EQ(1, all_urls.size() - prepopulate_urls.size()); 86 EXPECT_EQ(1, all_urls.size() - prepopulate_urls.size());
87 } 87 }
88 */ 88 */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698