X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fnet%2Fspdyproxy%2Fdata_reduction_proxy_settings_unittest_android.cc;h=8b52db2607e3c6731188cd4f00cc5e1390d148ac;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=d51f763df4714f27a88193c9d59f184b43037661;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc index d51f763..8b52db2 100644 --- a/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc +++ b/src/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc @@ -14,7 +14,7 @@ #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h" +#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -39,7 +39,7 @@ class TestDataReductionProxySettingsAndroid settings_(settings) {} // Returns the provided setting object. Used by wrapping methods. - virtual DataReductionProxySettings* Settings() OVERRIDE { + virtual DataReductionProxySettings* Settings() override { return settings_; } @@ -126,7 +126,7 @@ class DataReductionProxySettingsAndroidTest DataReductionProxyChromeSettings> { public: // DataReductionProxySettingsTest implementation: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { env_ = base::android::AttachCurrentThread(); DataReductionProxySettingsAndroid::Register(env_); DataReductionProxySettingsTestBase::SetUp();