summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation/geolocation_browsertest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 17:09:33 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 17:09:33 +0000
commit3c30b80afe18c734beb1beca6ea5ef7b6fc490af (patch)
tree2c27b933b881dbc09115a967087fad7065d5041f /chrome/browser/geolocation/geolocation_browsertest.cc
parent008ad53a782a8f5c8226f67734725f0d4652c7ff (diff)
downloadchromium_src-3c30b80afe18c734beb1beca6ea5ef7b6fc490af.zip
chromium_src-3c30b80afe18c734beb1beca6ea5ef7b6fc490af.tar.gz
chromium_src-3c30b80afe18c734beb1beca6ea5ef7b6fc490af.tar.bz2
Revert 85278 - Move TabSpecificContentSettings to TabContentWrapper.
Review URL: http://codereview.chromium.org/7012033 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/7015047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/geolocation_browsertest.cc')
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index b730d83..38adc83 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -308,10 +307,8 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
void SetInfobarResponse(const GURL& requesting_url, bool allowed) {
TabContents* tab_contents = current_browser_->GetSelectedTabContents();
- TabContentsWrapper* tab_contents_wrapper =
- current_browser_->GetSelectedTabContentsWrapper();
TabSpecificContentSettings* content_settings =
- tab_contents_wrapper->content_settings();
+ tab_contents->GetTabSpecificContentSettings();
const GeolocationSettingsState& settings_state =
content_settings->geolocation_settings_state();
size_t state_map_size = settings_state.state_map().size();