Merge 44735 - With the ChromeFrame moniker patch on, the data cache maintaine...

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"
@@ skipping 56 matching lines @@
   char ret[2 * sizeof(data)] = {0};
   DWORD read = 0;
 
   // Test 1: empty stream reads nothing
   CComObjectStackEx<CacheStream> cache_stream1;
   EXPECT_EQ(E_PENDING, cache_stream1.Read(ret, sizeof(ret), &read));
   EXPECT_EQ(0, read);
 
   // Test 2: Read from initialized cache
   CComObjectStackEx<CacheStream> cache_stream2;
-  cache_stream2.Initialize(data, sizeof(data));
+  cache_stream2.Initialize(data, sizeof(data), false);
   EXPECT_HRESULT_SUCCEEDED(cache_stream2.Read(ret, sizeof(ret), &read));
   EXPECT_EQ(sizeof(data), read);
   EXPECT_EQ(std::string(data), std::string(ret));
 
   read = 0;
   EXPECT_EQ(E_PENDING, cache_stream2.Read(ret, sizeof(ret), &read));
   EXPECT_EQ(0, read);
 }
 
 ACTION_P3(ReadStream, buffer, size, ret) {
@@ skipping 17 matching lines @@
 
   EXPECT_CALL(mock, OnDataAvailable(flags, size,
                     testing::Field(&FORMATETC::cfFormat, cf),
                     testing::Field(&STGMEDIUM::tymed, TYMED_ISTREAM)))
       .WillOnce(testing::DoAll(
           ReadStream(read_buffer1, &read_size1, &ret1),
           ReadStream(read_buffer2, &read_size2, &ret2),
           Return(S_OK)));
 
   EXPECT_HRESULT_SUCCEEDED(CacheStream::BSCBFeedData(&mock, data, size, cf,
-                                                     flags));
+                                                     flags, false));
 
   EXPECT_HRESULT_SUCCEEDED(ret1);
   EXPECT_STREQ(data, read_buffer1);
   EXPECT_EQ(size, read_size1);
 
   EXPECT_EQ(E_PENDING, ret2);
   EXPECT_STREQ("", read_buffer2);
   EXPECT_EQ(kArbitraryreadSize, read_size2);
 }
 
@@ skipping 114 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(E_PENDING, ret3);
   EXPECT_STREQ("", read_buffer3);
   EXPECT_EQ(sizeof(read_buffer3), read_size3);
 }