diff options
Diffstat (limited to 'chrome/renderer')
3 files changed, 15 insertions, 13 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc index 2233334..af4b859 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc @@ -21,7 +21,7 @@ #include "chrome/renderer/safe_browsing/mock_feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/murmurhash3_util.h" #include "chrome/renderer/safe_browsing/scorer.h" -#include "content/test/render_view_fake_resources_test.h" +#include "content/public/test/render_view_fake_resources_test.h" #include "crypto/sha2.h" #include "testing/gmock/include/gmock/gmock.h" @@ -32,7 +32,7 @@ using ::testing::Pair; namespace safe_browsing { -class PhishingClassifierTest : public RenderViewFakeResourcesTest { +class PhishingClassifierTest : public content::RenderViewFakeResourcesTest { protected: PhishingClassifierTest() : url_tld_token_net_(features::kUrlTldToken + std::string("net")), @@ -42,7 +42,7 @@ class PhishingClassifierTest : public RenderViewFakeResourcesTest { virtual void SetUp() { // Set up WebKit and the RenderView. - RenderViewFakeResourcesTest::SetUp(); + content::RenderViewFakeResourcesTest::SetUp(); // Construct a model to test with. We include one feature from each of // the feature extractors, which allows us to verify that they all ran. @@ -85,7 +85,7 @@ class PhishingClassifierTest : public RenderViewFakeResourcesTest { } virtual void TearDown() { - RenderViewFakeResourcesTest::TearDown(); + content::RenderViewFakeResourcesTest::TearDown(); } // Helper method to start phishing classification and wait for it to diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index 7390400..7da54d2 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -15,7 +15,7 @@ #include "chrome/renderer/safe_browsing/phishing_classifier.h" #include "chrome/renderer/safe_browsing/scorer.h" #include "content/public/renderer/render_view.h" -#include "content/test/render_view_fake_resources_test.h" +#include "content/public/test/render_view_fake_resources_test.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -58,15 +58,16 @@ class MockScorer : public Scorer { }; } // namespace -class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest { +class PhishingClassifierDelegateTest + : public content::RenderViewFakeResourcesTest { protected: bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegateTest, message) IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone, OnPhishingDetectionDone) - IPC_MESSAGE_UNHANDLED( - handled = RenderViewFakeResourcesTest::OnMessageReceived(message)) + IPC_MESSAGE_UNHANDLED(handled = + content::RenderViewFakeResourcesTest::OnMessageReceived(message)) IPC_END_MESSAGE_MAP() return handled; } diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index 47cf1f4..69c2eae 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -17,7 +17,7 @@ #include "base/time.h" #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/mock_feature_extractor_clock.h" -#include "content/test/render_view_fake_resources_test.h" +#include "content/public/test/render_view_fake_resources_test.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" @@ -30,7 +30,8 @@ using ::testing::Return; namespace safe_browsing { -class PhishingDOMFeatureExtractorTest : public RenderViewFakeResourcesTest { +class PhishingDOMFeatureExtractorTest + : public content::RenderViewFakeResourcesTest { public: // Helper for the SubframeRemoval test that posts a message to remove // the iframe "frame1" from the document. @@ -43,19 +44,19 @@ class PhishingDOMFeatureExtractorTest : public RenderViewFakeResourcesTest { protected: PhishingDOMFeatureExtractorTest() - : RenderViewFakeResourcesTest(), + : content::RenderViewFakeResourcesTest(), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} virtual ~PhishingDOMFeatureExtractorTest() {} virtual void SetUp() { // Set up WebKit and the RenderView. - RenderViewFakeResourcesTest::SetUp(); + content::RenderViewFakeResourcesTest::SetUp(); extractor_.reset(new PhishingDOMFeatureExtractor(view(), &clock_)); } virtual void TearDown() { - RenderViewFakeResourcesTest::TearDown(); + content::RenderViewFakeResourcesTest::TearDown(); } // Runs the DOMFeatureExtractor on the RenderView, waiting for the |