| Index: chrome/browser/safe_browsing/safe_browsing_test.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
|
| index 6c6ac8605542521339f4edecd60bbc19072611d6..21f6ec2e8d541a0cef40155747321670d4ca59f4 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_test.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
|
| @@ -112,7 +112,7 @@ class FakeSafeBrowsingService : public SafeBrowsingService {
|
| explicit FakeSafeBrowsingService(const std::string& url_prefix)
|
| : url_prefix_(url_prefix) {}
|
|
|
| - virtual SafeBrowsingProtocolConfig GetProtocolConfig() const OVERRIDE {
|
| + virtual SafeBrowsingProtocolConfig GetProtocolConfig() const override {
|
| SafeBrowsingProtocolConfig config;
|
| config.url_prefix = url_prefix_;
|
| // Makes sure the auto update is not triggered. The tests will force the
|
| @@ -139,7 +139,7 @@ class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
|
| explicit TestSafeBrowsingServiceFactory(const std::string& url_prefix)
|
| : url_prefix_(url_prefix) {}
|
|
|
| - virtual SafeBrowsingService* CreateSafeBrowsingService() OVERRIDE {
|
| + virtual SafeBrowsingService* CreateSafeBrowsingService() override {
|
| return new FakeSafeBrowsingService(url_prefix_);
|
| }
|
|
|
| @@ -255,7 +255,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
|
| return safe_browsing_service_ != NULL;
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| base::FilePath datafile_path;
|
| ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &datafile_path));
|
|
|
| @@ -275,13 +275,13 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
|
| InProcessBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| InProcessBrowserTest::TearDown();
|
|
|
| SafeBrowsingService::RegisterFactory(NULL);
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| // This test uses loopback. No need to use IPv6 especially it makes
|
| // local requests slow on Windows trybot when ipv6 local address [::1]
|
| // is not setup.
|
| @@ -351,7 +351,7 @@ class SafeBrowsingServerTestHelper
|
| // Callbacks for SafeBrowsingDatabaseManager::Client.
|
| virtual void OnCheckBrowseUrlResult(const GURL& url,
|
| SBThreatType threat_type,
|
| - const std::string& metadata) OVERRIDE {
|
| + const std::string& metadata) override {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| EXPECT_TRUE(safe_browsing_test_->is_checked_url_in_db());
|
| safe_browsing_test_->set_is_checked_url_safe(
|
| @@ -453,7 +453,7 @@ class SafeBrowsingServerTestHelper
|
| }
|
|
|
| // Callback for URLFetcher.
|
| - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
|
| + virtual void OnURLFetchComplete(const net::URLFetcher* source) override {
|
| source->GetResponseAsString(&response_data_);
|
| response_status_ = source->GetStatus().status();
|
| StopUILoop();
|
|
|