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

chrome_frame/test/util_unittests.cc

 // Copyright (c) 2010 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 "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/registry.h"
 #include "chrome_frame/utils.h"
 
@@ skipping 292 matching lines @@
 
   config_key.WriteValue(kEnableGCFRendererByDefault, static_cast<DWORD>(0));
   EXPECT_FALSE(IsGcfDefaultRenderer());
 
   config_key.WriteValue(kEnableGCFRendererByDefault, static_cast<DWORD>(1));
   EXPECT_TRUE(IsGcfDefaultRenderer());
 
   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());
   RegKey opt_for_gcf(config_key.Handle(), kRenderInGCFUrlList, KEY_ALL_ACCESS);
   EXPECT_TRUE(opt_for_gcf.Valid());
   RegKey opt_for_host(config_key.Handle(), kRenderInHostUrlList,
                       KEY_ALL_ACCESS);
   EXPECT_TRUE(opt_for_host.Valid());
   if (!config_key.Valid() || !opt_for_gcf.Valid() || !opt_for_host.Valid())
     return;
 
   const wchar_t kTestFilter[] = L"*.testing.chromium.org";
   const wchar_t kTestUrl[] = L"www.testing.chromium.org";
 
   // Save the current state of the registry.
   DWORD saved_default_renderer = 0;
   config_key.ReadValueDW(kEnableGCFRendererByDefault, &saved_default_renderer);
 
   // Make sure the host is the default renderer.
   config_key.WriteValue(kEnableGCFRendererByDefault, static_cast<DWORD>(0));
   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);
   opt_for_host.DeleteValue(kTestFilter);
   config_key.WriteValue(kEnableGCFRendererByDefault, saved_default_renderer);
 }