summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/isolated_app_browsertest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 00:49:21 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 00:49:21 +0000
commit138d966ceb995253ec3d7e2f06640d864d9fe635 (patch)
tree2c62876f104be4a287ab5914e36704c75966b32c /chrome/browser/extensions/isolated_app_browsertest.cc
parent21b3a6ae029799f140f08c0b2a47d3737e8f1f17 (diff)
downloadchromium_src-138d966ceb995253ec3d7e2f06640d864d9fe635.zip
chromium_src-138d966ceb995253ec3d7e2f06640d864d9fe635.tar.gz
chromium_src-138d966ceb995253ec3d7e2f06640d864d9fe635.tar.bz2
Hide geolocation_messages.h from chrome. It was only used in a test. Instead of having the GeolocationPermissionContext implementation have to call a static method in the interface, give it a callback when requesting permission. That way in tests we can just give a different callback. Also removed two trivial includes in this change.
BUG=98716 Review URL: http://codereview.chromium.org/8662041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/isolated_app_browsertest.cc')
-rw-r--r--chrome/browser/extensions/isolated_app_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc
index 431aa7a..8e3d28e 100644
--- a/chrome/browser/extensions/isolated_app_browsertest.cc
+++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -11,10 +11,10 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/test_url_constants.h"
#include "content/public/browser/render_process_host.h"
#include "net/base/mock_host_resolver.h"
@@ -192,7 +192,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, ProcessOverflow) {
browser(), base_url.Resolve("isolated_apps/app1/main.html"),
CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kTestNewTabURL),
+ browser(), GURL(chrome::kChromeUINewTabURL),
NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("hosted_app/main.html"),