[refactor] Fix autofill features for payments when the form is inside an OOPIF

chrome/renderer/autofill/page_click_tracker_browsertest.cc

Index: chrome/renderer/autofill/page_click_tracker_browsertest.cc
diff --git a/chrome/renderer/autofill/page_click_tracker_browsertest.cc b/chrome/renderer/autofill/page_click_tracker_browsertest.cc
index 92bcb3b475669602b583573ecd83c6298bd76f77..ab1e78e87bc41695147e6466935d458b6af0758f 100644
--- a/chrome/renderer/autofill/page_click_tracker_browsertest.cc
+++ b/chrome/renderer/autofill/page_click_tracker_browsertest.cc
@@ -5,6 +5,7 @@
 #include <memory>
 
 #include "chrome/test/base/chrome_render_view_test.h"
+#include "components/autofill/content/renderer/autofill_agent.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"
@@ -50,8 +51,10 @@ class PageClickTrackerTest : public ChromeRenderViewTest {
 
     // RenderView creates PageClickTracker but it doesn't keep it around.
     // Rather than make it do so for the test, we create a new object.
-    page_click_tracker_.reset(new PageClickTracker(view_->GetMainRenderFrame(),
-                                                   &test_listener_));
+    page_click_tracker_ =

[vabr (Chromium), 2017/04/14 06:44:24]

While your code is correct, it takes some mental effort to understand the
ownership transfer (page_clicl_tracker_ starts owning the object but becomes
just weak). Please consider making the code clearer like this:

auto page_click_tracker = base::MakeUnique<PageClickTracker>(...);
page_click_tracker_weak_ = page_click_tracker.get();
autofill_agent_->set_page_click_tracker_for_testing(std::move(page_click_tracker));

[EhsanK, 2017/04/18 17:55:19]

Thanks! Sorry for the vagueness in the code. But I noticed that we do not even
need a local reference to PageClickTracker in the test class since it is never
used. I removed the reference to it in this patch.

+        new PageClickTracker(view_->GetMainRenderFrame(), &test_listener_);
+
+    autofill_agent_->set_page_click_tracker_for_testing(page_click_tracker_);
 
     // Must be set before loading HTML.
     view_->GetWebView()->SetDefaultPageScaleLimits(1, 4);
@@ -82,11 +85,10 @@ class PageClickTrackerTest : public ChromeRenderViewTest {
     text_.Reset();
     textarea_.Reset();
     test_listener_.ClearResults();
-    page_click_tracker_.reset();
     ChromeRenderViewTest::TearDown();
   }
 
-  std::unique_ptr<PageClickTracker> page_click_tracker_;
+  PageClickTracker* page_click_tracker_;

[vabr (Chromium), 2017/04/14 06:44:24]

nit: Please rename to page_click_tracker_weak_ to clarify that this is not an
owning pointer.

[EhsanK, 2017/04/18 17:55:19]

Thanks! Removed as explained in comment above.

   TestPageClickListener test_listener_;
   blink::WebElement text_;
   blink::WebElement textarea_;