summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 17:33:52 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 17:33:52 +0000
commit9c29c4659efd728ac64d89950549cca9fd0b82ab (patch)
treeaaee7aac1101073ef00a316374004ff606383ba0
parent7ea40954cd6390f277617c987897e7671a4a4d66 (diff)
downloadchromium_src-9c29c4659efd728ac64d89950549cca9fd0b82ab.zip
chromium_src-9c29c4659efd728ac64d89950549cca9fd0b82ab.tar.gz
chromium_src-9c29c4659efd728ac64d89950549cca9fd0b82ab.tar.bz2
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
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index aac701b..f663044 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -20,7 +22,6 @@
#include "net/test/embedded_test_server/http_response.h"
#include "testing/gtest/include/gtest/gtest.h"
-using content::NavigationController;
using content::OpenURLParams;
using content::Referrer;
using content::WebContents;
@@ -64,15 +65,20 @@ class CacheMaxAgeHandler {
private:
std::string path_;
int request_count_;
-};
-} // namespace
+ DISALLOW_COPY_AND_ASSIGN(CacheMaxAgeHandler);
+};
class CrashRecoveryBrowserTest : public InProcessBrowserTest {
protected:
WebContents* 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.
@@ -127,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) {
// ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
// was not committed. This prevents regression of that bug.
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
- const base::FilePath::CharType* kTitle2File =
+ const base::FilePath::CharType kTitle2File[] =
FILE_PATH_LITERAL("title2.html");
ui_test_utils::NavigateToURL(
@@ -166,4 +172,6 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) {
ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
}
+} // namespace
+
#endif