Temporary workaround to get tests that reference singletons either directly o...

chrome_frame/test/urlmon_moniker_unittest.cc

 // Copyright (c) 2009 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 <atlbase.h>
 #include <atlcom.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "chrome_frame/urlmon_bind_status_callback.h"
+#include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/urlmon_moniker_tests.h"
 
+using chrome_frame_test::ScopedVirtualizeHklmAndHkcu;
 using testing::Return;
 using testing::Eq;
 
 class MonikerPatchTest : public testing::Test {
  protected:
   MonikerPatchTest() {
   }
 
   virtual void SetUp() {
+    DeleteAllSingletons();

[amit, 2010/12/08 23:40:35]

It safe now to delete the moniker patch code along with the tests :)

     PathService::Get(base::DIR_SOURCE_ROOT, &test_file_path_);
     test_file_path_ = test_file_path_.Append(FILE_PATH_LITERAL("chrome_frame"))
         .Append(FILE_PATH_LITERAL("test"))
         .Append(FILE_PATH_LITERAL("data"));
   }
 
   bool ReadFileAsString(const wchar_t* file_name, std::string* file_contents) {
     EXPECT_TRUE(file_name);
     FilePath file_path = test_file_path_.Append(file_name);
     return file_util::ReadFileToString(file_path, file_contents);
@@ skipping 18 matching lines @@
     if (SUCCEEDED(hr)) {
       RewindStream(stream);
       *ret = stream.Detach();
       result = true;
     }
 
     return result;
   }
 
   FilePath test_file_path_;
+  ScopedVirtualizeHklmAndHkcu virtualized_registry_;
 };
 
 // Tests the CacheStream class by writing content into a stream object
 // and verify that reading that stream back
 TEST_F(MonikerPatchTest, CacheStream) {
   const char data[] = "ReadStreamCacheTest";
   char ret[2 * sizeof(data)] = {0};
   DWORD read = 0;
 
   // Test 1: empty stream reads nothing
@@ skipping 169 matching lines @@
 
   std::string data_read;
   data_read.append(read_buffer1.get(), read_size1);
   data_read.append(read_buffer2.get(), read_size2);
   EXPECT_EQ(small_html_meta_tag, data_read);
 
   EXPECT_EQ(S_FALSE, ret3);
   EXPECT_STREQ("", read_buffer3);
   EXPECT_EQ(sizeof(read_buffer3), read_size3);
 }