diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 14:43:01 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 14:43:01 +0000 |
| commit | c6681f35e68c7689fdfd8794e0b1ec4cb92059e0 (patch) | |
| tree | 9bc947f0a938e736e3660507ba47e7e6bac97a00 /content/browser/debugger | |
| parent | c36a9e1dd2f21fce9ac430bd896b9f76e9a8eb73 (diff) | |
| download | chromium_src-c6681f35e68c7689fdfd8794e0b1ec4cb92059e0.zip chromium_src-c6681f35e68c7689fdfd8794e0b1ec4cb92059e0.tar.gz chromium_src-c6681f35e68c7689fdfd8794e0b1ec4cb92059e0.tar.bz2 | |
Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know when to create and set them and to handle special cases like zygote/single-process, directly ask the embedder to create an instance of a specific type. Also, if the embedder doesn't return an instance create the empty version.
Remove MockContentRendererClient since it existed before ContentRendererClient had an implementation and has no need anymore. Rename MockContentBrowserClient to TestContentBrowserClient to better reflect how it's used.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10479023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger')
| -rw-r--r-- | content/browser/debugger/devtools_manager_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc index 51f705b..c6a1507 100644 --- a/content/browser/debugger/devtools_manager_unittest.cc +++ b/content/browser/debugger/devtools_manager_unittest.cc @@ -6,7 +6,6 @@ #include "base/time.h" #include "content/browser/debugger/devtools_manager_impl.h" #include "content/browser/debugger/render_view_devtools_agent_host.h" -#include "content/browser/mock_content_browser_client.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/web_contents/test_web_contents.h" #include "content/common/view_messages.h" @@ -14,6 +13,7 @@ #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/test/test_content_browser_client.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; @@ -92,7 +92,7 @@ class TestWebContentsDelegate : public content::WebContentsDelegate { }; class DevToolsManagerTestBrowserClient - : public content::MockContentBrowserClient { + : public content::TestContentBrowserClient { public: DevToolsManagerTestBrowserClient() { } @@ -118,7 +118,7 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness { protected: virtual void SetUp() OVERRIDE { original_browser_client_ = content::GetContentClient()->browser(); - content::GetContentClient()->set_browser(&browser_client_); + content::GetContentClient()->set_browser_for_testing(&browser_client_); RenderViewHostImplTestHarness::SetUp(); TestDevToolsClientHost::ResetCounters(); @@ -126,7 +126,8 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness { virtual void TearDown() OVERRIDE { RenderViewHostImplTestHarness::TearDown(); - content::GetContentClient()->set_browser(original_browser_client_); + content::GetContentClient()->set_browser_for_testing( + original_browser_client_); } private: |