diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 20:42:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 20:42:20 +0000 |
| commit | 5b8ff1c76753a08b95d4c8b8d85644da93dabbdf (patch) | |
| tree | ccbf744b9d4e3afffaccfd4c5e5de7a1f8308581 /chrome/test/base/ui_test_utils.cc | |
| parent | 92ca91e6a9ba0b98f179d7a199d94c9042816f87 (diff) | |
| download | chromium_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/test/base/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index c1b4619..a6b4980 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -60,7 +60,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/geoposition.h" -#include "content/test/test_navigation_observer.h" +#include "content/public/test/test_navigation_observer.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "net/test/python_utils.h" @@ -326,7 +326,7 @@ bool GetCurrentTabTitle(const Browser* browser, string16* title) { void WaitForNavigations(NavigationController* controller, int number_of_navigations) { - TestNavigationObserver observer( + content::TestNavigationObserver observer( content::Source<NavigationController>(controller), NULL, number_of_navigations); observer.WaitForObservation( @@ -386,7 +386,7 @@ void OpenURLOffTheRecord(Profile* profile, const GURL& url) { } void NavigateToURL(browser::NavigateParams* params) { - TestNavigationObserver observer( + content::TestNavigationObserver observer( content::NotificationService::AllSources(), NULL, 1); browser::Navigate(params); observer.WaitForObservation( @@ -416,7 +416,7 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( NavigationController* controller = browser->GetSelectedWebContents() ? &browser->GetSelectedWebContents()->GetController() : NULL; - TestNavigationObserver same_tab_observer( + content::TestNavigationObserver same_tab_observer( content::Source<NavigationController>(controller), NULL, number_of_navigations); |