Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome...

chrome_frame/test/registry_watcher_unittest.cc

Index: chrome_frame/test/registry_watcher_unittest.cc
===================================================================
--- chrome_frame/test/registry_watcher_unittest.cc	(revision 0)
+++ chrome_frame/test/registry_watcher_unittest.cc	(revision 0)
@@ -0,0 +1,71 @@
+// Copyright (c) 2011 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 "chrome_frame/registry_watcher.h"
+
+#include "base/synchronization/waitable_event.h"
+#include "base/time.h"
+#include "base/win/registry.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using base::win::RegKey;
+
+const wchar_t test_root[] = L"CFRegistryWatcherTest";

[grt (UTC plus 2), 2011/05/26 17:08:58]

kTestRoot

[robertshield, 2011/05/27 03:34:59]

Done.

+const wchar_t kTestWindowClass[] = L"TestWndClass";
+const wchar_t kTestWindowName[] = L"TestWndName";
+
+// Give notifications 30 seconds to stick. Hopefully long enough to avoid
+// flakiness.
+const int64 kWaitSeconds = 30;
+
+class RegistryWatcherUnittest : public testing::Test {
+ public:
+  void SetUp() {
+    // Create a temporary key for testing
+    temp_key_.Open(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);

[grt (UTC plus 2), 2011/05/26 17:08:58]

Don't need all access to delete a subkey.  KEY_QUERY_VALUE will suffice.

[robertshield, 2011/05/27 03:34:59]

Done.

+    temp_key_.DeleteKey(test_root);
+    ASSERT_NE(ERROR_SUCCESS, temp_key_.Open(HKEY_CURRENT_USER,
+                                            test_root,
+                                            KEY_READ));
+    ASSERT_EQ(ERROR_SUCCESS,
+        temp_key_.Create(HKEY_CURRENT_USER, test_root, KEY_READ));
+
+    reg_change_count_ = 0;
+  }
+
+  void TearDown() {
+    // Clean up the temporary key
+    temp_key_.Open(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);

[grt (UTC plus 2), 2011/05/26 17:08:58]

Don't need all access to delete a subkey.  KEY_QUERY_VALUE will suffice.

[robertshield, 2011/05/27 03:34:59]

Done.

+    ASSERT_EQ(ERROR_SUCCESS, temp_key_.DeleteKey(test_root));
+

[grt (UTC plus 2), 2011/05/26 17:08:58]

temp_key_.Close();

[robertshield, 2011/05/27 03:34:59]

Done.

+    reg_change_count_ = 0;
+  }
+
+  static void CALLBACK WaitCallback(void* param, BOOLEAN wait_fired) {
+    reg_change_count_++;
+    event_.Signal();
+  }
+
+ protected:
+  RegKey temp_key_;
+  static unsigned int reg_change_count_;
+  static base::WaitableEvent event_;
+};
+
+unsigned int RegistryWatcherUnittest::reg_change_count_ = 0;
+base::WaitableEvent RegistryWatcherUnittest::event_(
+    false,   // auto reset
+    false);  // initially unsignalled
+
+TEST_F(RegistryWatcherUnittest, Basic) {
+  RegistryWatcher watcher(HKEY_CURRENT_USER,
+                          test_root,
+                          &RegistryWatcherUnittest::WaitCallback);
+  ASSERT_TRUE(watcher.StartWatching());
+  EXPECT_EQ(0, reg_change_count_);
+
+  EXPECT_EQ(ERROR_SUCCESS, temp_key_.CreateKey(L"foo", KEY_ALL_ACCESS));
+  EXPECT_TRUE(event_.TimedWait(base::TimeDelta::FromSeconds(kWaitSeconds)));
+  EXPECT_EQ(1, reg_change_count_);
+}
Property changes on: chrome_frame\test\registry_watcher_unittest.cc
___________________________________________________________________
Added: svn:eol-style
   + LF