Commit 9c29c465 authored by thestig@chromium.org's avatar thestig@chromium.org

Do not generate crash dumps in CrashRecoveryBrowserTest.

BUG=375900

Review URL: https://codereview.chromium.org/294903010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272220 0039d316-1c4b-4281-b951-d872f2087c98
parent 7ea40954
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "base/command_line.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
...@@ -20,7 +22,6 @@ ...@@ -20,7 +22,6 @@
#include "net/test/embedded_test_server/http_response.h" #include "net/test/embedded_test_server/http_response.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
using content::NavigationController;
using content::OpenURLParams; using content::OpenURLParams;
using content::Referrer; using content::Referrer;
using content::WebContents; using content::WebContents;
...@@ -64,15 +65,20 @@ class CacheMaxAgeHandler { ...@@ -64,15 +65,20 @@ class CacheMaxAgeHandler {
private: private:
std::string path_; std::string path_;
int request_count_; int request_count_;
};
} // namespace DISALLOW_COPY_AND_ASSIGN(CacheMaxAgeHandler);
};
class CrashRecoveryBrowserTest : public InProcessBrowserTest { class CrashRecoveryBrowserTest : public InProcessBrowserTest {
protected: protected:
WebContents* GetActiveWebContents() { WebContents* GetActiveWebContents() {
return browser()->tab_strip_model()->GetActiveWebContents(); return browser()->tab_strip_model()->GetActiveWebContents();
} }
private:
virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kDisableBreakpad);
}
}; };
// Test that reload works after a crash. // Test that reload works after a crash.
...@@ -127,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) { ...@@ -127,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) {
// ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab // ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
// was not committed. This prevents regression of that bug. // was not committed. This prevents regression of that bug.
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) { IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
const base::FilePath::CharType* kTitle2File = const base::FilePath::CharType kTitle2File[] =
FILE_PATH_LITERAL("title2.html"); FILE_PATH_LITERAL("title2.html");
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
...@@ -166,4 +172,6 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) { ...@@ -166,4 +172,6 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) {
ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL()); ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
} }
} // namespace
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment