Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / net / chrome_network_delegate_unittest.cc

diff --git a/src/chrome/browser/net/chrome_network_delegate_unittest.cc b/src/chrome/browser/net/chrome_network_delegate_unittest.cc
index bfec361..0dc2baa 100644 (file)
--- a/src/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/src/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -31,13 +31,13 @@ class ChromeNetworkDelegateTest : public testing::Test {
       : forwarder_(new extensions::EventRouterForwarder()) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     never_throttle_requests_original_value_ =
         ChromeNetworkDelegate::g_never_throttle_requests_;
     ChromeNetworkDelegate::g_never_throttle_requests_ = false;
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     ChromeNetworkDelegate::g_never_throttle_requests_ =
         never_throttle_requests_original_value_;
   }
@@ -103,7 +103,7 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
 #endif
   }
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_, NULL, &force_google_safe_search_,
         profile_.GetTestingPrefService());
@@ -114,7 +114,7 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
         new ChromeNetworkDelegate(forwarder(), &enable_referrers_));
     network_delegate->set_force_google_safe_search(&force_google_safe_search_);
-    return network_delegate.PassAs<net::NetworkDelegate>();
+    return network_delegate.Pass();
   }
 
   void SetSafeSearch(bool value) {
@@ -312,7 +312,7 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
         kFirstPartySite("http://cool.things.com"),
         kBlockedFirstPartySite("http://no.thirdparties.com") {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_, NULL, NULL,
         profile_.GetTestingPrefService());