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

Original description: 

- added detection of IE9 for ChromeFrame.IEVersion metric
- replaced ChromeFrame.FullTabLaunchType metric with ChromeFrame.LaunchType metric,
which logs more info regarding how it came to be that GCF rendered a page
(but only for the CTransaction patch)

BUG=43885
TEST=none

Review URL: http://codereview.chromium.org/3443017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60188 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc
index e265567..055bae9 100644
--- a/chrome_frame/test/util_unittests.cc
+++ b/chrome_frame/test/util_unittests.cc
@@ -310,7 +310,7 @@ TEST(UtilTests, IsDefaultRendererTest) {
   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 @@ TEST(UtilTests, IsOptInUrlTest) {
   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);