Also use EXPECT_NEAR in AllFramesGetDefaultZoom and SubframeRetainsZoomOnNavigation.

content/browser/iframe_zoom_browsertest.cc

 // Copyright 2016 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 <vector>
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/host_zoom_map.h"
@@ skipping 298 matching lines @@
                                  scale_one_grandchild_width, kTolerance);
 
     const double new_default_zoom_level =
         default_zoom_level + ZoomFactorToZoomLevel(new_default_zoom_factor);
 
     host_zoom_map->SetZoomLevelForHost("b.com", new_default_zoom_level + 1.0);
     host_zoom_map->SetDefaultZoomLevel(new_default_zoom_level);
 
     WaitAndCheckFrameZoom(msg_queue, frame_observers);
   }
-  EXPECT_DOUBLE_EQ(
+  // Make this comparison approximate for Nexus5X test;
+  // https://crbug.com/622858.
+  EXPECT_NEAR(
       new_default_zoom_factor,
-      GetMainFrameZoomFactor(web_contents(), main_frame_window_border));
+      GetMainFrameZoomFactor(web_contents(), main_frame_window_border),
+      0.01
+  );
 }
 
 IN_PROC_BROWSER_TEST_F(IFrameZoomBrowserTest, SiblingFramesZoom) {
   std::string top_level_host("a.com");
   GURL main_url(embedded_test_server()->GetURL(
       top_level_host, "/cross_site_iframe_factory.html?a(b,b)"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
   NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(entry);
@@ skipping 76 matching lines @@
     frame_observers.emplace_back(child, "child",
                                  scale_one_child_width, kTolerance);
 
     const double new_zoom_level =
         default_zoom_level + ZoomFactorToZoomLevel(new_zoom_factor);
     host_zoom_map->SetZoomLevelForHost(top_level_host, new_zoom_level);
 
     WaitAndCheckFrameZoom(msg_queue, frame_observers);
   }
 
   EXPECT_DOUBLE_EQ(

[Charlie Reis, 2016/06/27 21:23:08]

What about this one?

[wjmaclean, 2016/06/27 21:53:58]

Sure, given the use of log/exp in converting between zoom levels and zoom
factors, and given a 1% change in zoom is close enough for testing, then it
seems reasonable to change here as well.

[ghost stip (do not use), 2016/06/27 23:21:16]

Done.

       new_zoom_factor,
       GetMainFrameZoomFactor(web_contents(), main_frame_window_border));
 
   // Navigate child frame cross site, and make sure zoom is the same.
   TestNavigationObserver observer(web_contents());
   GURL url = embedded_test_server()->GetURL("c.com", "/title1.html");
   NavigateFrameToURL(root->child_at(0), url);
   EXPECT_TRUE(observer.last_navigation_succeeded());
   EXPECT_EQ(url, observer.last_navigation_url());
 
@@ skipping 34 matching lines @@
   EXPECT_EQ(redirect_url, web_contents()->GetLastCommittedURL());
 
   EXPECT_NEAR(
       kZoomFactorForRedirectedHost,
       GetMainFrameZoomFactor(web_contents(), main_frame_window_border),
       0.001);
 }
 #endif
 
 }  // namespace content