summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 20:42:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 20:42:20 +0000
commit5b8ff1c76753a08b95d4c8b8d85644da93dabbdf (patch)
treeccbf744b9d4e3afffaccfd4c5e5de7a1f8308581 /chrome/browser/download
parent92ca91e6a9ba0b98f179d7a199d94c9042816f87 (diff)
downloadchromium_src-5b8ff1c76753a08b95d4c8b8d85644da93dabbdf.zip
chromium_src-5b8ff1c76753a08b95d4c8b8d85644da93dabbdf.tar.gz
chromium_src-5b8ff1c76753a08b95d4c8b8d85644da93dabbdf.tar.bz2
Move more test headers from content\test to content\public\test. This way we can enforce that internal content headers don't leak to embedders. Move these headers into the content namespace in the process.
BUG=98716 TBR=phajdan.jr Review URL: https://chromiumcodereview.appspot.com/10497009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 25c86e8..26dcdaa 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -56,10 +56,10 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/context_menu_params.h"
#include "content/public/common/page_transition_types.h"
+#include "content/public/test/test_navigation_observer.h"
#include "content/test/net/url_request_mock_http_job.h"
#include "content/test/net/url_request_slow_download_job.h"
#include "content/test/test_file_error_injector.h"
-#include "content/test/test_navigation_observer.h"
#include "net/base/net_util.h"
#include "net/test/test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -971,7 +971,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) {
// Try to start the download via Javascript and wait for the corresponding
// load stop event.
- TestNavigationObserver observer(
+ content::TestNavigationObserver observer(
content::Source<content::NavigationController>(
&web_contents->GetController()),
NULL,