diff options
author | vivek.vg <vivek.vg@samsung.com> | 2014-12-22 06:37:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 14:38:30 +0000 |
commit | d155cb80c7b61e65f3999df1718c3be6e3cce0b4 (patch) | |
tree | af6a8cbd63a08f53c4fddbe37b7f4c7748b13070 | |
parent | ccfd55115d9642d55e5346ae337bcb92f5f913a6 (diff) | |
download | chromium_src-d155cb80c7b61e65f3999df1718c3be6e3cce0b4.zip chromium_src-d155cb80c7b61e65f3999df1718c3be6e3cce0b4.tar.gz chromium_src-d155cb80c7b61e65f3999df1718c3be6e3cce0b4.tar.bz2 |
Tests in browser_tests target should use ChromeRenderViewTest as the base class.
Currently these tests are utilizing the content::RenderViewTest as the base class
whereas all other *_browsertest.cc are using ChromeRenderViewTest as the base class.
Due to this, the migration of inline CSS to GRD being done in [1] is failing
for browsertests target as listed here [2] in the build log.
In order to fix this, these tests should use the ChromeRenderViewTest as their base class.
In doing so, the ChromeRenderViewTest loads ChromeContentClient which in turn loads the correct
pak file i.e. resources.pak required for the migration.
This CL adds the extensions/DEPS rule to allow the inclusion of chrome_render_view_test.h.
[1] https://codereview.chromium.org/573553002
[2] http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/14184
Review URL: https://codereview.chromium.org/818563003
Cr-Commit-Position: refs/heads/master@{#309424}
-rw-r--r-- | chrome/renderer/autofill/page_click_tracker_browsertest.cc | 8 | ||||
-rw-r--r-- | extensions/DEPS | 1 | ||||
-rw-r--r-- | extensions/renderer/script_context_browsertest.cc | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/renderer/autofill/page_click_tracker_browsertest.cc b/chrome/renderer/autofill/page_click_tracker_browsertest.cc index 4097350..6495254 100644 --- a/chrome/renderer/autofill/page_click_tracker_browsertest.cc +++ b/chrome/renderer/autofill/page_click_tracker_browsertest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/basictypes.h" +#include "chrome/test/base/chrome_render_view_test.h" #include "components/autofill/content/renderer/page_click_listener.h" #include "components/autofill/content/renderer/page_click_tracker.h" #include "content/public/renderer/render_view.h" -#include "content/public/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebInputElement.h" @@ -41,10 +41,10 @@ class TestPageClickListener : public PageClickListener { bool was_focused_; }; -class PageClickTrackerTest : public content::RenderViewTest { +class PageClickTrackerTest : public ChromeRenderViewTest { protected: void SetUp() override { - content::RenderViewTest::SetUp(); + ChromeRenderViewTest::SetUp(); // RenderView creates PageClickTracker but it doesn't keep it around. // Rather than make it do so for the test, we create a new object. @@ -71,7 +71,7 @@ class PageClickTrackerTest : public content::RenderViewTest { textarea_.reset(); test_listener_.ClearResults(); page_click_tracker_.reset(); - content::RenderViewTest::TearDown(); + ChromeRenderViewTest::TearDown(); } // Simulates a click on the given element and then waits for the stack diff --git a/extensions/DEPS b/extensions/DEPS index b237be8..1a7b60a 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -48,6 +48,7 @@ specific_include_rules = { "+chrome/browser/extensions/test_extension_system.h", "+chrome/browser/ui/browser.h", "+chrome/common/extensions/features/feature_channel.h", + "+chrome/test/base/chrome_render_view_test.h", "+chrome/test/base/testing_profile.h", "+chrome/test/base/ui_test_utils.h", ], diff --git a/extensions/renderer/script_context_browsertest.cc b/extensions/renderer/script_context_browsertest.cc index aeb74e45..2559a69 100644 --- a/extensions/renderer/script_context_browsertest.cc +++ b/extensions/renderer/script_context_browsertest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/test/base/chrome_render_view_test.h" #include "content/public/renderer/render_frame.h" #include "content/public/test/frame_load_waiter.h" -#include "content/public/test/render_view_test.h" #include "extensions/renderer/script_context.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" @@ -15,7 +15,7 @@ using blink::WebFrame; namespace extensions { namespace { -class ScriptContextTest : public content::RenderViewTest { +class ScriptContextTest : public ChromeRenderViewTest { protected: GURL GetEffectiveDocumentURL(const WebFrame* frame) { return ScriptContext::GetEffectiveDocumentURL( |