Plugin Power Saver: Improve Poster behavior for essential plugins.

content/renderer/peripheral_content_heuristic_unittest.cc

Index: content/renderer/peripheral_content_heuristic_unittest.cc
diff --git a/content/renderer/peripheral_content_heuristic_unittest.cc b/content/renderer/peripheral_content_heuristic_unittest.cc
index ddd78d5ecc56b6299586b4adcac88a8d21f0047a..99f8e9ebd7154ac65e5b4fa4e7b3dd9c1c5e9a11 100644
--- a/content/renderer/peripheral_content_heuristic_unittest.cc
+++ b/content/renderer/peripheral_content_heuristic_unittest.cc
@@ -5,6 +5,7 @@
 #include "content/renderer/peripheral_content_heuristic.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -18,66 +19,78 @@ const char kOtherOrigin[] = "http://other.com";
 }  // namespaces
 
 TEST(PeripheralContentHeuristic, AllowSameOrigin) {
-  EXPECT_EQ(
-      PeripheralContentHeuristic::HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN,
-      PeripheralContentHeuristic::GetPeripheralStatus(
-          std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-          url::Origin(GURL(kSameOrigin)), 100, 100));
-  EXPECT_EQ(
-      PeripheralContentHeuristic::HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN,
-      PeripheralContentHeuristic::GetPeripheralStatus(
-          std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-          url::Origin(GURL(kSameOrigin)), 1000, 1000));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_SAME_ORIGIN,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kSameOrigin)), gfx::Size(100, 100)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_SAME_ORIGIN,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kSameOrigin)), gfx::Size(1000, 1000)));
 }
 
 TEST(PeripheralContentHeuristic, DisallowCrossOriginUnlessLarge) {
-  EXPECT_EQ(PeripheralContentHeuristic::HEURISTIC_DECISION_PERIPHERAL,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_PERIPHERAL,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(100, 100)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_BIG,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 100, 100));
-  EXPECT_EQ(
-      PeripheralContentHeuristic::HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_BIG,
-      PeripheralContentHeuristic::GetPeripheralStatus(
-          std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-          url::Origin(GURL(kOtherOrigin)), 1000, 1000));
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(1000, 1000)));
 }
 
 TEST(PeripheralContentHeuristic, AlwaysAllowTinyContent) {
-  EXPECT_EQ(
-      PeripheralContentHeuristic::HEURISTIC_DECISION_ESSENTIAL_SAME_ORIGIN,
-      PeripheralContentHeuristic::GetPeripheralStatus(
-          std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-          url::Origin(GURL(kSameOrigin)), 1, 1));
-  EXPECT_EQ(PeripheralContentHeuristic::
-                HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_TINY,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_SAME_ORIGIN,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kSameOrigin)), gfx::Size(1, 1)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_TINY,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 1, 1));
-  EXPECT_EQ(PeripheralContentHeuristic::
-                HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_TINY,
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(1, 1)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_TINY,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 5, 5));
-  EXPECT_EQ(PeripheralContentHeuristic::HEURISTIC_DECISION_PERIPHERAL,
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(5, 5)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_PERIPHERAL,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 10, 10));
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(10, 10)));
 }
 
 TEST(PeripheralContentHeuristic, TemporaryOriginWhitelist) {
-  EXPECT_EQ(PeripheralContentHeuristic::HEURISTIC_DECISION_PERIPHERAL,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_PERIPHERAL,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 100, 100));
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(100, 100)));
 
   std::set<url::Origin> whitelist;
   whitelist.insert(url::Origin(GURL(kOtherOrigin)));
 
-  EXPECT_EQ(PeripheralContentHeuristic::
-                HEURISTIC_DECISION_ESSENTIAL_CROSS_ORIGIN_WHITELISTED,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_WHITELISTED,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                whitelist, url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kOtherOrigin)), gfx::Size(100, 100)));
+}
+
+TEST(PeripheralContentHeuristic, UndefinedSize) {
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_SAME_ORIGIN,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kSameOrigin)), gfx::Size()));
+
+  std::set<url::Origin> whitelist;
+  whitelist.insert(url::Origin(GURL(kOtherOrigin)));
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_WHITELISTED,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 whitelist, url::Origin(GURL(kSameOrigin)),
-                url::Origin(GURL(kOtherOrigin)), 100, 100));
+                url::Origin(GURL(kOtherOrigin)), gfx::Size()));
+
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_UNKNOWN_SIZE,
+            PeripheralContentHeuristic::GetPeripheralStatus(
+                std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
+                url::Origin(GURL(kOtherOrigin)), gfx::Size()));
 }
 
 }  // namespace content