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

content/renderer/render_frame_impl_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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "build/build_config.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/common/frame_messages.h"
 #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"
 #include "content/public/test/test_utils.h"
 #include "content/renderer/navigation_state_impl.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/test/fake_compositor_dependencies.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h"
@@ skipping 51 matching lines @@
 
   void TearDown() override {
 #if defined(LEAK_SANITIZER)
      // Do this before shutting down V8 in RenderViewTest::TearDown().
      // http://crbug.com/328552
      __lsan_do_leak_check();
 #endif
      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,
                                   blink::WebEffectiveConnectionType type) {
     frame->effective_connection_type_ = type;
   }
 
   RenderFrameImpl* GetMainRenderFrame() {
     return static_cast<RenderFrameImpl*>(view_->GetMainRenderFrame());
   }
@@ skipping 88 matching lines @@
   static_cast<RenderViewImpl*>(view_)->OnMessageReceived(was_shown_message);
 
   // This test is primarily checking that this case does not crash, but
   // observers should still be notified.
   EXPECT_TRUE(observer.visible());
 }
 
 // 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();
 
   // The main frame's and subframe's LoFi states should stay the same on
   // 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 =
       DocumentState::FromDataSource(frame()->GetWebFrame()->dataSource());
   static_cast<NavigationStateImpl*>(document_state->navigation_state())
       ->set_was_within_same_page(false);
 
   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(
       GetMainRenderFrame()->GetWebFrame()->dataSource());
   static_cast<NavigationStateImpl*>(document_state->navigation_state())
       ->set_was_within_same_page(false);
 
   // Calling didCommitProvisionalLoad is not representative of a full navigation
   // 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.
 }
 
 // Test that effective connection type only updates for new main frame
 // documents.
 TEST_F(RenderFrameImplTest, EffectiveConnectionType) {
   EXPECT_EQ(blink::WebEffectiveConnectionType::TypeUnknown,
             frame()->getEffectiveConnectionType());
@@ skipping 122 matching lines @@
   common_params.url = GURL("data:text/html,max_zoomlimit_test");
   GetMainRenderFrame()->SetHostZoomLevel(common_params.url, kMaxZoomLevel);
   GetMainRenderFrame()->NavigateInternal(
       common_params, StartNavigationParams(), RequestNavigationParams(),
       std::unique_ptr<StreamOverrideParameters>());
   ProcessPendingMessages();
   EXPECT_DOUBLE_EQ(kMaxZoomLevel, view_->GetWebView()->zoomLevel());
 }
 
 }  // namespace