summaryrefslogtreecommitdiffstats
path: root/content/browser/download
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
commit52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch)
treef39b0d32959778625fdeb00f178061a6411213c3 /content/browser/download
parent78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff)
downloadchromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576 TEST=none Review URL: https://chromiumcodereview.appspot.com/10702029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/download')
-rw-r--r--content/browser/download/mhtml_generation_browsertest.cc3
-rw-r--r--content/browser/download/save_package_browsertest.cc5
2 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index 14baaa6..4e9cb41 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -6,6 +6,7 @@
#include "base/file_path.h"
#include "base/scoped_temp_dir.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -56,7 +57,7 @@ IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) {
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/google/google.html"));
- WebContents* web_contents = browser()->GetActiveWebContents();
+ WebContents* web_contents = chrome::GetActiveWebContents(browser());
web_contents->GenerateMHTML(path,
base::Bind(&MHTMLGenerationTest::MHTMLGenerated,
this));
diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc
index 8f40fcc..bfe0a82 100644
--- a/content/browser/download/save_package_browsertest.cc
+++ b/content/browser/download/save_package_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_temp_dir.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/download/save_package.h"
@@ -40,7 +41,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) {
FilePath full_file_name, dir;
GetDestinationPaths("a", &full_file_name, &dir);
scoped_refptr<SavePackage> save_package(new SavePackage(
- browser()->GetActiveWebContents(),
+ chrome::GetActiveWebContents(browser()),
content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
ASSERT_TRUE(test_server()->Stop());
}
@@ -54,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) {
FilePath full_file_name, dir;
GetDestinationPaths("a", &full_file_name, &dir);
scoped_refptr<SavePackage> save_package(new SavePackage(
- browser()->GetActiveWebContents(),
+ chrome::GetActiveWebContents(browser()),
content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
save_package->Cancel(true);
ASSERT_TRUE(test_server()->Stop());