diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /content/browser/download/mhtml_generation_browsertest.cc | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'content/browser/download/mhtml_generation_browsertest.cc')
| -rw-r--r-- | content/browser/download/mhtml_generation_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 6944a6cdb7..26835dd9e4 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -12,7 +12,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { @@ -24,7 +24,7 @@ class MHTMLGenerationTest : public ContentBrowserTest { void MHTMLGenerated(const base::FilePath& path, int64 size) { mhtml_generated_ = true; file_size_ = size; - MessageLoopForUI::current()->Quit(); + base::MessageLoopForUI::current()->Quit(); } protected: |