Plugin Power Saver: Refactor some Tiny plugin code and tests.

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 99f8e9ebd7154ac65e5b4fa4e7b3dd9c1c5e9a11..57396a7688b3dde59598f08d6864a73d32762cfc 100644
--- a/content/renderer/peripheral_content_heuristic_unittest.cc
+++ b/content/renderer/peripheral_content_heuristic_unittest.cc
@@ -40,16 +40,16 @@ TEST(PeripheralContentHeuristic, DisallowCrossOriginUnlessLarge) {
                 url::Origin(GURL(kOtherOrigin)), gfx::Size(1000, 1000)));
 }
 
-TEST(PeripheralContentHeuristic, AlwaysAllowTinyContent) {
+TEST(PeripheralContentHeuristic, TinyContent) {
   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,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_TINY,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
                 url::Origin(GURL(kOtherOrigin)), gfx::Size(1, 1)));
-  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_TINY,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_TINY,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
                 url::Origin(GURL(kOtherOrigin)), gfx::Size(5, 5)));
@@ -87,7 +87,7 @@ TEST(PeripheralContentHeuristic, UndefinedSize) {
                 whitelist, url::Origin(GURL(kSameOrigin)),
                 url::Origin(GURL(kOtherOrigin)), gfx::Size()));
 
-  EXPECT_EQ(RenderFrame::CONTENT_STATUS_ESSENTIAL_UNKNOWN_SIZE,
+  EXPECT_EQ(RenderFrame::CONTENT_STATUS_UNKNOWN_SIZE,
             PeripheralContentHeuristic::GetPeripheralStatus(
                 std::set<url::Origin>(), url::Origin(GURL(kSameOrigin)),
                 url::Origin(GURL(kOtherOrigin)), gfx::Size()));