Change Lo-Fi bool to bitmask to support multiple Previews types

content/renderer/render_frame_impl_browsertest.cc

Index: content/renderer/render_frame_impl_browsertest.cc
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc
index 69eeeec8ea70909e1e6d6a05e03aaff3bf46e84c..98fd03df050f50201bfd34adc3ac5c5369b3f2d7 100644
--- a/content/renderer/render_frame_impl_browsertest.cc
+++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -12,6 +12,7 @@
 #include "content/common/frame_owner_properties.h"
 #include "content/common/renderer.mojom.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/previews_state.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/test/frame_load_waiter.h"
 #include "content/public/test/render_view_test.h"
@@ -83,8 +84,8 @@ class RenderFrameImplTest : public RenderViewTest {
      RenderViewTest::TearDown();
   }
 
-  void SetIsUsingLoFi(RenderFrameImpl* frame, bool is_using_lofi) {
-    frame->is_using_lofi_ = is_using_lofi;
+  void SetPreviewsState(RenderFrameImpl* frame, int previews_state) {

[nasko, 2016/12/08 22:19:34]

PreviewsState

[megjablon, 2016/12/09 20:35:55]

Done.

+    frame->previews_state_ = previews_state;
   }
 
   void SetEffectionConnectionType(RenderFrameImpl* frame,
@@ -193,10 +194,10 @@ TEST_F(RenderFrameImplTest, MAYBE_FrameWasShownAfterWidgetClose) {
 // Test that LoFi state only updates for new main frame documents. Subframes
 // inherit from the main frame and should not change at commit time.
 TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
-  SetIsUsingLoFi(GetMainRenderFrame(), true);
-  SetIsUsingLoFi(frame(), true);
-  EXPECT_TRUE(GetMainRenderFrame()->IsUsingLoFi());
-  EXPECT_TRUE(frame()->IsUsingLoFi());
+  SetPreviewsState(GetMainRenderFrame(), SERVER_LOFI_ON);
+  SetPreviewsState(frame(), SERVER_LOFI_ON);
+  EXPECT_EQ(SERVER_LOFI_ON, GetMainRenderFrame()->GetPreviewsState());
+  EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
 
   blink::WebHistoryItem item;
   item.initialize();
@@ -205,11 +206,11 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
   // navigations within the page.
   frame()->didNavigateWithinPage(frame()->GetWebFrame(), item,
                                  blink::WebStandardCommit, true);
-  EXPECT_TRUE(frame()->IsUsingLoFi());
+  EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
   GetMainRenderFrame()->didNavigateWithinPage(
       GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit,
       true);
-  EXPECT_TRUE(GetMainRenderFrame()->IsUsingLoFi());
+  EXPECT_EQ(SERVER_LOFI_ON, GetMainRenderFrame()->GetPreviewsState());
 
   // The subframe's LoFi state should not be reset on commit.
   DocumentState* document_state =
@@ -219,7 +220,7 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
 
   frame()->didCommitProvisionalLoad(frame()->GetWebFrame(), item,
                                     blink::WebStandardCommit);
-  EXPECT_TRUE(frame()->IsUsingLoFi());
+  EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
 
   // The main frame's LoFi state should be reset to off on commit.
   document_state = DocumentState::FromDataSource(
@@ -231,7 +232,7 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
   // but serves the purpose of testing the LoFi state logic.
   GetMainRenderFrame()->didCommitProvisionalLoad(
       GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit);
-  EXPECT_FALSE(GetMainRenderFrame()->IsUsingLoFi());
+  EXPECT_EQ(PREVIEWS_OFF, GetMainRenderFrame()->GetPreviewsState());
   // The subframe would be deleted here after a cross-document navigation. It
   // happens to be left around in this test because this does not simulate the
   // frame detach.