Chromium Code Reviews| Index: chrome/browser/crash_recovery_browsertest.cc |
| =================================================================== |
| --- chrome/browser/crash_recovery_browsertest.cc (revision 271530) |
| +++ chrome/browser/crash_recovery_browsertest.cc (working copy) |
| @@ -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 @@ |
| private: |
| std::string path_; |
| int request_count_; |
| + |
| + DISALLOW_COPY_AND_ASSIGN(CacheMaxAgeHandler); |
| }; |
| -} // namespace |
| - |
| 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); |
|
Paweł Hajdan Jr.
2014/05/22 07:00:27
Don't we want to disable this for all browser test
Lei Zhang
2014/05/22 07:21:07
Several years ago, Chromium builds didn't have Bre
|
| + } |
| }; |
| // Test that reload works after a crash. |
| @@ -127,7 +133,7 @@ |
| // 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 @@ |
| ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL()); |
| } |
| +} // namespace |
| + |
| #endif |