Remove extra calls of didMeaningfulLayout() during the same navigation

chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string.h>
 
 #include "base/command_line.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/dom_distiller/content/browser/distillable_page_utils.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace dom_distiller {
 
 using ::testing::_;
 using namespace switches::reader_mode_heuristics;
 
 namespace {
 
 const char kSimpleArticlePath[] = "/dom_distiller/simple_article.html";
+const char kSimpleArticleIFramePath[] =
+    "/dom_distiller/simple_article_iframe.html";
 const char kArticlePath[] = "/dom_distiller/og_article.html";
 const char kNonArticlePath[] = "/dom_distiller/non_og_article.html";
 
+const char* kAllPaths[] = {

[dglazkov, 2016/01/15 19:41:47]

We need to test this at a higher level, since the bug you're fixing is actually
in WebViewImpl.

[wychen, 2016/01/15 22:31:02]

I'll add one in WebViewTest. I think it would still make sense to keep the test
here just to be safe, because I'll be adding reader mode features that relies on
the behavior.

+    kSimpleArticlePath,
+    kSimpleArticleIFramePath,
+    kArticlePath,
+    kNonArticlePath
+};
+
 class Holder {
  public:
   virtual ~Holder() {}
   virtual void OnResult(bool, bool) = 0;
 };
 
 class MockDelegate : public Holder {
  public:
   MOCK_METHOD2(OnResult, void(bool, bool));
 
@@ skipping 47 matching lines @@
     DistillablePageUtilsBrowserTestOption<kAlwaysTrue>;
 
 IN_PROC_BROWSER_TEST_F(DistillablePageUtilsBrowserTestAlways,
                        TestDelegate) {
   // Run twice to make sure the delegate object is still alive.
   for (int i = 0; i < 2; ++i) {
     testing::InSequence dummy;
     EXPECT_CALL(holder_, OnResult(true, true)).Times(1);
     NavigateAndWait(kSimpleArticlePath);
   }
+  for (unsigned i = 0; i < sizeof(kAllPaths) / sizeof(kAllPaths[0]); ++i) {
+    testing::InSequence dummy;
+    EXPECT_CALL(holder_, OnResult(true, true)).Times(1);
+    NavigateAndWait(kAllPaths[i]);
+  }
   // Test pages that we don't care about its distillability.
   {
     testing::InSequence dummy;
     EXPECT_CALL(holder_, OnResult(_, _)).Times(0);
     NavigateAndWait("about:blank");
   }
 }
 
 
 using DistillablePageUtilsBrowserTestNone =
@@ skipping 22 matching lines @@
     NavigateAndWait(kNonArticlePath);
   }
 }
 
 
 using DistillablePageUtilsBrowserTestAdaboost =
     DistillablePageUtilsBrowserTestOption<kAdaBoost>;
 
 IN_PROC_BROWSER_TEST_F(DistillablePageUtilsBrowserTestAdaboost,
                        TestDelegate) {
-  {
+  const char* paths[] = {kSimpleArticlePath, kSimpleArticleIFramePath};
+  for (unsigned i = 0; i < sizeof(paths)/sizeof(paths[0]); ++i) {
     testing::InSequence dummy;
     EXPECT_CALL(holder_, OnResult(true, false)).Times(1);
     EXPECT_CALL(holder_, OnResult(true, true)).Times(1);
-    NavigateAndWait(kSimpleArticlePath);
+    NavigateAndWait(paths[i]);
   }
   {
     testing::InSequence dummy;
     EXPECT_CALL(holder_, OnResult(false, false)).Times(1);
     EXPECT_CALL(holder_, OnResult(false, true)).Times(1);
     NavigateAndWait(kNonArticlePath);
   }
 }
 
 }  // namespace dom_distiller