Add the save_package_browsertest.cc to content_browsertests.

Also move mouseleave_browsertest.cc to src\chrome. This is an interactive_ui_tests, and while we can theoretically create another content_browsertest target for interactive tests, it seems pointless for just one test. So run it as part of chrome.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10821089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148970 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -488,6 +488,7 @@
         'browser/browser_focus_uitest.cc',
         'browser/browser_keyevents_browsertest.cc',
         'browser/instant/instant_browsertest.cc',
+        'browser/mouseleave_browsertest.cc',
         'browser/printing/print_dialog_cloud_interative_uitest.cc',
         'browser/task_manager/task_manager_browsertest_util.cc',
         'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc',
@@ -519,7 +520,6 @@
         'test/base/view_event_test_base.cc',
         'test/base/view_event_test_base.h',
         'test/ppapi/ppapi_interactive_browsertest.cc',
-        '../content/browser/mouseleave_browsertest.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {

content/browser/download/save_package_browsertest.cc

@@ -3,21 +3,20 @@
 // found in the LICENSE file.
 
 #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"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test.h"
+#include "content/test/content_browser_test_utils.h"
 
-namespace {
+namespace content {
 
-const char kTestFile[] = "files/save_page/a.htm";
+const char kTestFile[] = "files/simple_page.html";
 
-class SavePackageBrowserTest : public InProcessBrowserTest {
+class SavePackageBrowserTest : public ContentBrowserTest {
  protected:
   void SetUp() OVERRIDE {
     ASSERT_TRUE(save_dir_.CreateUniqueTempDir());
-    InProcessBrowserTest::SetUp();
+    ContentBrowserTest::SetUp();
   }
 
   // Returns full paths of destination file and directory.
@@ -37,12 +36,12 @@ class SavePackageBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kTestFile);
-  ui_test_utils::NavigateToURL(browser(), url);
+  NavigateToURL(shell(), url);
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      chrome::GetActiveWebContents(browser()),
-      content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
+      shell()->web_contents(), SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name,
+      dir));
   ASSERT_TRUE(test_server()->Stop());
 }
 
@@ -51,14 +50,14 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) {
 IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kTestFile);
-  ui_test_utils::NavigateToURL(browser(), url);
+  NavigateToURL(shell(), url);
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      chrome::GetActiveWebContents(browser()),
-      content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
+      shell()->web_contents(), SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name,
+      dir));
   save_package->Cancel(true);
   ASSERT_TRUE(test_server()->Stop());
 }
 
-}  // namespace
+}  // namespace content

content/content_tests.gypi

@@ -566,6 +566,7 @@
         'browser/device_orientation/device_orientation_browsertest.cc',
         'browser/dom_storage/dom_storage_browsertest.cc',
         'browser/download/mhtml_generation_browsertest.cc',
+        'browser/download/save_package_browsertest.cc',
         'browser/fileapi/file_system_browsertest.cc',
         'browser/in_process_webkit/indexed_db_browsertest.cc',
         'browser/in_process_webkit/indexed_db_layout_browsertest.cc',