Committing http://codereview.chromium.org/3420004/show for grt@...

chrome_frame/test/util_unittests.cc

Index: chrome_frame/test/util_unittests.cc
===================================================================
--- chrome_frame/test/util_unittests.cc	(revision 60165)
+++ chrome_frame/test/util_unittests.cc	(working copy)
@@ -310,7 +310,7 @@
   config_key.WriteValue(kEnableGCFRendererByDefault, saved_default_renderer);
 }
 
-TEST(UtilTests, IsOptInUrlTest) {
+TEST(UtilTests, RendererTypeForUrlTest) {
   // Open all the keys we need.
   RegKey config_key(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_ALL_ACCESS);
   EXPECT_TRUE(config_key.Valid());
@@ -334,18 +334,19 @@
   EXPECT_FALSE(IsGcfDefaultRenderer());
 
   opt_for_gcf.DeleteValue(kTestFilter);  // Just in case this exists
-  EXPECT_FALSE(IsOptInUrl(kTestUrl));
+  EXPECT_EQ(RENDERER_TYPE_UNDETERMINED, RendererTypeForUrl(kTestUrl));
   opt_for_gcf.WriteValue(kTestFilter, L"");
-  EXPECT_TRUE(IsOptInUrl(kTestUrl));
+  EXPECT_EQ(RENDERER_TYPE_CHROME_OPT_IN_URL, RendererTypeForUrl(kTestUrl));
 
   // Now set GCF as the default renderer.
   config_key.WriteValue(kEnableGCFRendererByDefault, static_cast<DWORD>(1));
   EXPECT_TRUE(IsGcfDefaultRenderer());
 
   opt_for_host.DeleteValue(kTestFilter);  // Just in case this exists
-  EXPECT_TRUE(IsOptInUrl(kTestUrl));
+  EXPECT_EQ(RENDERER_TYPE_CHROME_DEFAULT_RENDERER,
+            RendererTypeForUrl(kTestUrl));
   opt_for_host.WriteValue(kTestFilter, L"");
-  EXPECT_FALSE(IsOptInUrl(kTestUrl));
+  EXPECT_EQ(RENDERER_TYPE_UNDETERMINED, RendererTypeForUrl(kTestUrl));
 
   // Cleanup.
   opt_for_gcf.DeleteValue(kTestFilter);