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

Side by Side Diff: content/browser/download/mhtml_generation_browsertest.cc

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/bind.h" 5 #include "base/bind.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/scoped_temp_dir.h" 7 #include "base/scoped_temp_dir.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/testing_browser_process.h" 10 #include "chrome/test/base/testing_browser_process.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/browser/download/mhtml_generation_manager.h" 12 #include "content/browser/download/mhtml_generation_manager.h"
13 #include "content/browser/tab_contents/tab_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "net/test/test_server.h" 14 #include "net/test/test_server.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using content::WebContents;
18
17 namespace { 19 namespace {
18 20
19 class MHTMLGenerationTest : public InProcessBrowserTest { 21 class MHTMLGenerationTest : public InProcessBrowserTest {
20 public: 22 public:
21 MHTMLGenerationTest() : mhtml_generated_(false), file_size_(0) {} 23 MHTMLGenerationTest() : mhtml_generated_(false), file_size_(0) {}
22 24
23 void MHTMLGenerated(const FilePath& path, int64 size) { 25 void MHTMLGenerated(const FilePath& path, int64 size) {
24 mhtml_generated_ = true; 26 mhtml_generated_ = true;
25 file_size_ = size; 27 file_size_ = size;
26 MessageLoopForUI::current()->Quit(); 28 MessageLoopForUI::current()->Quit();
(...skipping 21 matching lines...) Expand all
48 // renderer. 50 // renderer.
49 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) { 51 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) {
50 ASSERT_TRUE(test_server()->Start()); 52 ASSERT_TRUE(test_server()->Start());
51 53
52 FilePath path(temp_dir_.path()); 54 FilePath path(temp_dir_.path());
53 path = path.Append(FILE_PATH_LITERAL("test.mht")); 55 path = path.Append(FILE_PATH_LITERAL("test.mht"));
54 56
55 ui_test_utils::NavigateToURL(browser(), 57 ui_test_utils::NavigateToURL(browser(),
56 test_server()->GetURL("files/google/google.html")); 58 test_server()->GetURL("files/google/google.html"));
57 59
58 TabContents* tab = browser()->GetSelectedTabContents(); 60 WebContents* tab = browser()->GetSelectedWebContents();
59 MHTMLGenerationManager* mhtml_generation_manager = 61 MHTMLGenerationManager* mhtml_generation_manager =
60 g_browser_process->mhtml_generation_manager(); 62 g_browser_process->mhtml_generation_manager();
61 63
62 mhtml_generation_manager->GenerateMHTML(tab, path, 64 mhtml_generation_manager->GenerateMHTML(tab, path,
63 base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this)); 65 base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this));
64 66
65 // Block until the MHTML is generated. 67 // Block until the MHTML is generated.
66 ui_test_utils::RunMessageLoop(); 68 ui_test_utils::RunMessageLoop();
67 69
68 EXPECT_TRUE(mhtml_generated()); 70 EXPECT_TRUE(mhtml_generated());
69 EXPECT_GT(file_size(), 0); 71 EXPECT_GT(file_size(), 0);
70 72
71 // Make sure the actual generated file has some contents. 73 // Make sure the actual generated file has some contents.
72 int64 file_size; 74 int64 file_size;
73 ASSERT_TRUE(file_util::GetFileSize(path, &file_size)); 75 ASSERT_TRUE(file_util::GetFileSize(path, &file_size));
74 EXPECT_GT(file_size, 100); 76 EXPECT_GT(file_size, 100);
75 } 77 }
76 78
77 } // namespace 79 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698