Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This test creates a safebrowsing service using test safebrowsing database 5 // This test creates a safebrowsing service using test safebrowsing database
6 // and a test protocol manager. It is used to test logics in safebrowsing 6 // and a test protocol manager. It is used to test logics in safebrowsing
7 // service. 7 // service.
8 8
9 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 9 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
10 10
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 } 545 }
546 546
547 void SetUpOnMainThread() override { 547 void SetUpOnMainThread() override {
548 g_browser_process->safe_browsing_service()->ui_manager()->AddObserver( 548 g_browser_process->safe_browsing_service()->ui_manager()->AddObserver(
549 &observer_); 549 &observer_);
550 } 550 }
551 551
552 void TearDownOnMainThread() override { 552 void TearDownOnMainThread() override {
553 g_browser_process->safe_browsing_service()->ui_manager()->RemoveObserver( 553 g_browser_process->safe_browsing_service()->ui_manager()->RemoveObserver(
554 &observer_); 554 &observer_);
555 InProcessBrowserTest::TearDownOnMainThread();
556 } 555 }
557 556
558 void SetUpInProcessBrowserTestFixture() override { 557 void SetUpInProcessBrowserTestFixture() override {
559 base::FilePath test_data_dir; 558 base::FilePath test_data_dir;
560 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); 559 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
561 embedded_test_server()->RegisterRequestHandler( 560 embedded_test_server()->RegisterRequestHandler(
562 base::Bind(&HandleNeverCompletingRequests)); 561 base::Bind(&HandleNeverCompletingRequests));
563 embedded_test_server()->ServeFilesFromDirectory(test_data_dir); 562 embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
564 ASSERT_TRUE(embedded_test_server()->Start()); 563 ASSERT_TRUE(embedded_test_server()->Start());
565 } 564 }
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1612 return false; 1611 return false;
1613 } 1612 }
1614 if (!smt.Run()) { 1613 if (!smt.Run()) {
1615 EXPECT_TRUE(false); 1614 EXPECT_TRUE(false);
1616 return false; 1615 return false;
1617 } 1616 }
1618 return InProcessBrowserTest::SetUpUserDataDirectory(); 1617 return InProcessBrowserTest::SetUpUserDataDirectory();
1619 } 1618 }
1620 1619
1621 void TearDownInProcessBrowserTestFixture() override { 1620 void TearDownInProcessBrowserTestFixture() override {
1622 InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
1623
1624 sql::Connection db; 1621 sql::Connection db;
1625 base::FilePath cookie_path( 1622 base::FilePath cookie_path(
1626 SafeBrowsingService::GetCookieFilePathForTesting()); 1623 SafeBrowsingService::GetCookieFilePathForTesting());
1627 ASSERT_TRUE(db.Open(cookie_path)); 1624 ASSERT_TRUE(db.Open(cookie_path));
1628 1625
1629 sql::Statement smt( 1626 sql::Statement smt(
1630 db.GetUniqueStatement("SELECT name, value FROM cookies ORDER BY name")); 1627 db.GetUniqueStatement("SELECT name, value FROM cookies ORDER BY name"));
1631 ASSERT_TRUE(smt.is_valid()); 1628 ASSERT_TRUE(smt.is_valid());
1632 ASSERT_TRUE(smt.Step()); 1629 ASSERT_TRUE(smt.Step());
1633 ASSERT_EQ("a", smt.ColumnString(0)); 1630 ASSERT_EQ("a", smt.ColumnString(0));
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
2355 } 2352 }
2356 2353
2357 INSTANTIATE_TEST_CASE_P( 2354 INSTANTIATE_TEST_CASE_P(
2358 MaybeSetMetadata, 2355 MaybeSetMetadata,
2359 V4SafeBrowsingServiceMetadataTest, 2356 V4SafeBrowsingServiceMetadataTest,
2360 testing::Values(ThreatPatternType::NONE, 2357 testing::Values(ThreatPatternType::NONE,
2361 ThreatPatternType::MALWARE_LANDING, 2358 ThreatPatternType::MALWARE_LANDING,
2362 ThreatPatternType::MALWARE_DISTRIBUTION)); 2359 ThreatPatternType::MALWARE_DISTRIBUTION));
2363 2360
2364 } // namespace safe_browsing 2361 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698