Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / safe_browsing / safe_browsing_test.cc

diff --git a/src/chrome/browser/safe_browsing/safe_browsing_test.cc b/src/chrome/browser/safe_browsing/safe_browsing_test.cc
index 6c6ac86..c4b272e 100644 (file)
--- a/src/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/src/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -40,9 +40,9 @@
 #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"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_utils.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_log.h"
 #include "net/dns/host_resolver.h"
@@ -112,7 +112,7 @@ class FakeSafeBrowsingService : public SafeBrowsingService {
   explicit FakeSafeBrowsingService(const std::string& url_prefix)
       : url_prefix_(url_prefix) {}
 
-  virtual SafeBrowsingProtocolConfig GetProtocolConfig() const OVERRIDE {
+  SafeBrowsingProtocolConfig GetProtocolConfig() const override {
     SafeBrowsingProtocolConfig config;
     config.url_prefix = url_prefix_;
     // Makes sure the auto update is not triggered. The tests will force the
@@ -126,7 +126,7 @@ class FakeSafeBrowsingService : public SafeBrowsingService {
   }
 
  private:
-  virtual ~FakeSafeBrowsingService() {}
+  ~FakeSafeBrowsingService() override {}
 
   std::string url_prefix_;
 
@@ -139,7 +139,7 @@ class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
   explicit TestSafeBrowsingServiceFactory(const std::string& url_prefix)
       : url_prefix_(url_prefix) {}
 
-  virtual SafeBrowsingService* CreateSafeBrowsingService() OVERRIDE {
+  SafeBrowsingService* CreateSafeBrowsingService() override {
     return new FakeSafeBrowsingService(url_prefix_);
   }
 
@@ -160,8 +160,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
       is_checked_url_safe_(false) {
   }
 
-  virtual ~SafeBrowsingServerTest() {
-  }
+  ~SafeBrowsingServerTest() override {}
 
   void UpdateSafeBrowsingStatus() {
     ASSERT_TRUE(safe_browsing_service_);
@@ -255,7 +254,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
     return safe_browsing_service_ != NULL;
   }
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     base::FilePath datafile_path;
     ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &datafile_path));
 
@@ -275,13 +274,13 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     InProcessBrowserTest::TearDown();
 
     SafeBrowsingService::RegisterFactory(NULL);
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  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.
@@ -349,9 +348,9 @@ class SafeBrowsingServerTestHelper
   }
 
   // Callbacks for SafeBrowsingDatabaseManager::Client.
-  virtual void OnCheckBrowseUrlResult(const GURL& url,
-                                      SBThreatType threat_type,
-                                      const std::string& metadata) OVERRIDE {
+  void OnCheckBrowseUrlResult(const GURL& url,
+                              SBThreatType threat_type,
+                              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 +452,7 @@ class SafeBrowsingServerTestHelper
   }
 
   // Callback for URLFetcher.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
+  void OnURLFetchComplete(const net::URLFetcher* source) override {
     source->GetResponseAsString(&response_data_);
     response_status_ = source->GetStatus().status();
     StopUILoop();
@@ -465,7 +464,7 @@ class SafeBrowsingServerTestHelper
 
  private:
   friend class base::RefCountedThreadSafe<SafeBrowsingServerTestHelper>;
-  virtual ~SafeBrowsingServerTestHelper() {}
+  ~SafeBrowsingServerTestHelper() override {}
 
   // Stops UI loop after desired status is updated.
   void StopUILoop() {