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

Side by Side Diff: chrome/browser/extensions/api/page_capture/page_capture_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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/extensions/api/page_capture/page_capture_api.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/api/page_capture/page_capture_api.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "net/base/mock_host_resolver.h" 11 #include "net/dns/mock_host_resolver.h"
12 12
13 using extensions::PageCaptureSaveAsMHTMLFunction; 13 using extensions::PageCaptureSaveAsMHTMLFunction;
14 14
15 class ExtensionPageCaptureApiTest : public ExtensionApiTest { 15 class ExtensionPageCaptureApiTest : public ExtensionApiTest {
16 public: 16 public:
17 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 17 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
18 ExtensionApiTest::SetUpCommandLine(command_line); 18 ExtensionApiTest::SetUpCommandLine(command_line);
19 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); 19 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
20 } 20 }
21 21
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) { 57 IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) {
58 PageCaptureSaveAsMHTMLDelegate delegate; 58 PageCaptureSaveAsMHTMLDelegate delegate;
59 ASSERT_TRUE(RunExtensionTest("page_capture")) << message_; 59 ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
60 ASSERT_FALSE(delegate.temp_file_.empty()); 60 ASSERT_FALSE(delegate.temp_file_.empty());
61 // Flush the message loops to make sure the delete happens. 61 // Flush the message loops to make sure the delete happens.
62 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); 62 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
63 content::RunAllPendingInMessageLoop(content::BrowserThread::IO); 63 content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
64 ASSERT_FALSE(file_util::PathExists(delegate.temp_file_)); 64 ASSERT_FALSE(file_util::PathExists(delegate.temp_file_));
65 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698