Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

Revert of Extract WebFrameClient implementation out of WebTestProxyBase. (patchset #5 id:80001 of https://codereview.chromium.org/1821923003/ )

Reason for revert:
use after free in color chooser

Original issue's description:
> Extract WebFrameClient implementation out of WebTestProxyBase.
>
> Overview
> ========
>
> This CL extracts WebFrameClient-specific parts of WebTestProxyBase into
> a new WebFrameTestClient class.
>
> This CL is part of a sequence of CLs that make progress toward:
>
> 1) Splitting WebTestProxyBase into separate WebFrameClient /
>    WebWidgetClient / WebViewClient focused classes
>
> 2) Removing WebTestProxyBase from public API of components/test_runner
>    (and having WebTestProxy and WebFrameTestProxy consume instead
>    abstract WebFrameClient / WebWidgetClient / WebViewClient interfaces).
>
> Details
> =======
>
> Most of the change is mechanical move of code from WebTestProxyBase
> into the new WebFrameTestClient (slightly tweaking method signatures
> as needed to make them fit WebFrameClient interface - note camelCasing
> and extra parameters here and there).
>
> Additionally some helper methods (i.e. URLDescription and
> WebNavigationPolicyToString) are now needed by both WebTestProxyBase and
> by WebFrameTestClient.  Consequently, to facilitate code reuse, these
> helper methods were moved to test_common.cc.
>
> Finally, in order to decouple WebFrameTestClient from view-specific
> WebTestProxyBase the CL does the following:
>
> - It moves counting currently active color choosers from
>   WebTestProxyBase into TestRunner (and adjusts MockColorChooser
>   accordingly).
>
> - It moves ownership of MockWebUserMediaClient from
>   WebTestProxyBase into TestRunner.  This is quite natural, as
>   MockWebUserMediaClient depends only on WebTestDelegate::PostTask and
>   WebTestDelegate::AddMediaStreamAudioSourceAndTrack (which are not
>   view-specific).
>
> - Replacing WebFrameTestProxy::set_base_proxy with
>   WebFrameTestProxy::set_test_client requires refactoring how higher
>   layers provide the necessary object - in particular after the CL the
>   WebFrame[Test]Client cannot be extracted from WebTestProxy/RenderView
>   (because the whole point of this CL is to remove the coupling between
>   view-specific WebTestProxy and frame-focused WebFrameTestProxy).  This
>   part of the refactoring is accomplished by adding a frame-proxy
>   creation callback that can be provided to EnableWebTestProxyCreation
>   (similarily how it already was accepting equivalent view-proxy
>   creation callback).  This refactoring also necessitates extracting a
>   WebFrameTestProxyBase (to have a concrete/non-templatized type that
>   content/shell/.../layout_tests layer can take a dependency on).
>
> BUG=595089
>
> Committed: https://crrev.com/11e459b088ab4736f10776a3831d0b9ddf249517
> Cr-Commit-Position: refs/heads/master@{#384044}

TBR=kochi@chromium.org,lukasza@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595089
Committed: https://crrev.com/69e85e2e09b39a7c5366a8c704a984622b1e7846
Cr-Commit-Position: refs/heads/master@{#384269}

[jochen (gone - plz use gerrit), 2016-03-31 08:43:00]

Created Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

[commit-bot: I haz the power, 2016-03-31 08:43:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1841833005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1841833005/1

[commit-bot: I haz the power, 2016-03-31 08:44:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-31 08:44:41]

Failed to apply patch for components/test_runner/test_runner.cc:
While running git apply --index -3 -p1;
  error: patch failed: components/test_runner/test_runner.cc:19
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: components/test_runner/test_runner.cc: patch does not apply

Patch:       components/test_runner/test_runner.cc
Index: components/test_runner/test_runner.cc
diff --git a/components/test_runner/test_runner.cc
b/components/test_runner/test_runner.cc
index
60fa315e8bb048352a952547f747d8d17e468600..a5cf1865625a7625876c0dd814bf72e812a35774
100644
--- a/components/test_runner/test_runner.cc
+++ b/components/test_runner/test_runner.cc
@@ -19,7 +19,6 @@
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
-#include "components/test_runner/mock_web_user_media_client.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_preferences.h"
 #include "components/test_runner/web_content_settings.h"
@@ -1669,7 +1668,6 @@
       web_view_(nullptr),
       web_content_settings_(new WebContentSettings()),
       mock_screen_orientation_client_(new MockScreenOrientationClient),
-      chooser_count_(0),
       weak_factory_(this) {}
 
 TestRunner::~TestRunner() {}
@@ -1764,7 +1762,6 @@
 
   platform_name_ = "chromium";
   tooltip_text_ = std::string();
-  chooser_count_ = 0;
   web_history_item_count_ = 0;
   intercept_post_message_ = false;
 
@@ -2518,12 +2515,6 @@
   return mock_screen_orientation_client_.get();
 }
 
-MockWebUserMediaClient* TestRunner::getMockWebUserMediaClient() {
-  if (!user_media_client_.get())
-    user_media_client_.reset(new MockWebUserMediaClient(delegate_));
-  return user_media_client_.get();
-}
-
 void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
   blink::WebScreenOrientationType orientation;
 
@@ -2546,14 +2537,6 @@
 
 void TestRunner::DisableMockScreenOrientation() {
   mock_screen_orientation_client_->SetDisabled(true);
-}
-
-void TestRunner::DidOpenChooser() {
-  chooser_count_++;
-}
-
-void TestRunner::DidCloseChooser() {
-  chooser_count_--;
 }
 
 void TestRunner::DidAcquirePointerLock() {
@@ -2865,7 +2848,7 @@
 }
 
 bool TestRunner::IsChooserShown() {
-  return 0 < chooser_count_;
+  return proxy_->IsChooserShown();
 }
 
 void TestRunner::EvaluateInWebInspector(int call_id,

[commit-bot: I haz the power, 2016-03-31 08:44:49]

The CQ bit was unchecked by commit-bot@chromium.org

[Łukasz Anforowicz, 2016-03-31 14:18:54]

The CQ bit was checked by lukasza@chromium.org

[commit-bot: I haz the power, 2016-03-31 14:19:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1841833005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1841833005/1

[commit-bot: I haz the power, 2016-03-31 14:20:23]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-03-31 14:21:31]

Description was changed from

==========
Revert of Extract WebFrameClient implementation out of WebTestProxyBase.
(patchset #5 id:80001 of https://codereview.chromium.org/1821923003/ )

Reason for revert:
use after free in color chooser

Original issue's description:
> Extract WebFrameClient implementation out of WebTestProxyBase.
> 
> Overview
> ========
> 
> This CL extracts WebFrameClient-specific parts of WebTestProxyBase into
> a new WebFrameTestClient class.
> 
> This CL is part of a sequence of CLs that make progress toward:
> 
> 1) Splitting WebTestProxyBase into separate WebFrameClient /
>    WebWidgetClient / WebViewClient focused classes
> 
> 2) Removing WebTestProxyBase from public API of components/test_runner
>    (and having WebTestProxy and WebFrameTestProxy consume instead
>    abstract WebFrameClient / WebWidgetClient / WebViewClient interfaces).
> 
> Details
> =======
> 
> Most of the change is mechanical move of code from WebTestProxyBase
> into the new WebFrameTestClient (slightly tweaking method signatures
> as needed to make them fit WebFrameClient interface - note camelCasing
> and extra parameters here and there).
> 
> Additionally some helper methods (i.e. URLDescription and
> WebNavigationPolicyToString) are now needed by both WebTestProxyBase and
> by WebFrameTestClient.  Consequently, to facilitate code reuse, these
> helper methods were moved to test_common.cc.
> 
> Finally, in order to decouple WebFrameTestClient from view-specific
> WebTestProxyBase the CL does the following:
> 
> - It moves counting currently active color choosers from
>   WebTestProxyBase into TestRunner (and adjusts MockColorChooser
>   accordingly).
> 
> - It moves ownership of MockWebUserMediaClient from
>   WebTestProxyBase into TestRunner.  This is quite natural, as
>   MockWebUserMediaClient depends only on WebTestDelegate::PostTask and
>   WebTestDelegate::AddMediaStreamAudioSourceAndTrack (which are not
>   view-specific).
> 
> - Replacing WebFrameTestProxy::set_base_proxy with
>   WebFrameTestProxy::set_test_client requires refactoring how higher
>   layers provide the necessary object - in particular after the CL the
>   WebFrame[Test]Client cannot be extracted from WebTestProxy/RenderView
>   (because the whole point of this CL is to remove the coupling between
>   view-specific WebTestProxy and frame-focused WebFrameTestProxy).  This
>   part of the refactoring is accomplished by adding a frame-proxy
>   creation callback that can be provided to EnableWebTestProxyCreation
>   (similarily how it already was accepting equivalent view-proxy
>   creation callback).  This refactoring also necessitates extracting a
>   WebFrameTestProxyBase (to have a concrete/non-templatized type that
>   content/shell/.../layout_tests layer can take a dependency on).
> 
> BUG=595089
> 
> Committed: https://crrev.com/11e459b088ab4736f10776a3831d0b9ddf249517
> Cr-Commit-Position: refs/heads/master@{#384044}

TBR=kochi@chromium.org,lukasza@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595089
==========

to

==========
Revert of Extract WebFrameClient implementation out of WebTestProxyBase.
(patchset #5 id:80001 of https://codereview.chromium.org/1821923003/ )

Reason for revert:
use after free in color chooser

Original issue's description:
> Extract WebFrameClient implementation out of WebTestProxyBase.
>
> Overview
> ========
>
> This CL extracts WebFrameClient-specific parts of WebTestProxyBase into
> a new WebFrameTestClient class.
>
> This CL is part of a sequence of CLs that make progress toward:
>
> 1) Splitting WebTestProxyBase into separate WebFrameClient /
>    WebWidgetClient / WebViewClient focused classes
>
> 2) Removing WebTestProxyBase from public API of components/test_runner
>    (and having WebTestProxy and WebFrameTestProxy consume instead
>    abstract WebFrameClient / WebWidgetClient / WebViewClient interfaces).
>
> Details
> =======
>
> Most of the change is mechanical move of code from WebTestProxyBase
> into the new WebFrameTestClient (slightly tweaking method signatures
> as needed to make them fit WebFrameClient interface - note camelCasing
> and extra parameters here and there).
>
> Additionally some helper methods (i.e. URLDescription and
> WebNavigationPolicyToString) are now needed by both WebTestProxyBase and
> by WebFrameTestClient.  Consequently, to facilitate code reuse, these
> helper methods were moved to test_common.cc.
>
> Finally, in order to decouple WebFrameTestClient from view-specific
> WebTestProxyBase the CL does the following:
>
> - It moves counting currently active color choosers from
>   WebTestProxyBase into TestRunner (and adjusts MockColorChooser
>   accordingly).
>
> - It moves ownership of MockWebUserMediaClient from
>   WebTestProxyBase into TestRunner.  This is quite natural, as
>   MockWebUserMediaClient depends only on WebTestDelegate::PostTask and
>   WebTestDelegate::AddMediaStreamAudioSourceAndTrack (which are not
>   view-specific).
>
> - Replacing WebFrameTestProxy::set_base_proxy with
>   WebFrameTestProxy::set_test_client requires refactoring how higher
>   layers provide the necessary object - in particular after the CL the
>   WebFrame[Test]Client cannot be extracted from WebTestProxy/RenderView
>   (because the whole point of this CL is to remove the coupling between
>   view-specific WebTestProxy and frame-focused WebFrameTestProxy).  This
>   part of the refactoring is accomplished by adding a frame-proxy
>   creation callback that can be provided to EnableWebTestProxyCreation
>   (similarily how it already was accepting equivalent view-proxy
>   creation callback).  This refactoring also necessitates extracting a
>   WebFrameTestProxyBase (to have a concrete/non-templatized type that
>   content/shell/.../layout_tests layer can take a dependency on).
>
> BUG=595089
>
> Committed: https://crrev.com/11e459b088ab4736f10776a3831d0b9ddf249517
> Cr-Commit-Position: refs/heads/master@{#384044}

TBR=kochi@chromium.org,lukasza@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595089

Committed: https://crrev.com/69e85e2e09b39a7c5366a8c704a984622b1e7846
Cr-Commit-Position: refs/heads/master@{#384269}
==========

[commit-bot: I haz the power, 2016-03-31 14:21:31]

Patchset 1 (id:??) landed as
https://crrev.com/69e85e2e09b39a7c5366a8c704a984622b1e7846
Cr-Commit-Position: refs/heads/master@{#384269}