Merge 47232 - Not using std::wstring to store progress status text because ms...

chrome_frame/urlmon_bind_status_callback.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 "chrome_frame/urlmon_bind_status_callback.h"
 
 #include <mshtml.h>
 #include <shlguid.h>
 
 #include "base/logging.h"
@@ skipping 184 matching lines @@
       }
     }
     DLOG(INFO) << __FUNCTION__ << "Url: " << url_ <<
       StringPrintf("Renderer type: %s",
                     renderer_type_ == CHROME ? "CHROME" : "OTHER");
   }
 }
 
 /////////////////////////////////////////////////////////////////////
 
+BSCBStorageBind::BSCBStorageBind() : clip_format_(CF_NULL) {
+}
+
+BSCBStorageBind::~BSCBStorageBind() {
+  for (std::vector<Progress*>::iterator i = saved_progress_.begin();
+       i != saved_progress_.end(); i++) {
+    delete (*i);
+  }
+}
+
 HRESULT BSCBStorageBind::Initialize(IMoniker* moniker, IBindCtx* bind_ctx) {
   DLOG(INFO) << __FUNCTION__ << me() << StringPrintf(" tid=%i",
       PlatformThread::CurrentId());
 
   std::wstring url = GetActualUrlFromMoniker(moniker, bind_ctx,
                                              std::wstring());
   HRESULT hr = data_sniffer_.InitializeCache(url);
   if (FAILED(hr))
     return hr;
 
@@ skipping 26 matching lines @@
   // chrome frame
   if (status_code == BINDSTATUS_REDIRECTING) {
     scoped_refptr<BindContextInfo> info =
         BindContextInfo::FromBindContext(bind_ctx_);
     DCHECK(info);
     if (info)
       info->set_url(status_text);
   }
 
   if (ShouldCacheProgress(status_code)) {
-    Progress new_progress = { progress, progress_max, status_code,
-                              status_text ? status_text : std::wstring() };
-    saved_progress_.push_back(new_progress);
+    saved_progress_.push_back(new Progress(progress, progress_max, status_code,
+                                           status_text));
   } else {
     hr = CallbackImpl::OnProgress(progress, progress_max, status_code,
                                status_text);
   }
 
   return hr;
 }
 
 // Refer to urlmon_moniker.h for explanation of how things work.
 STDMETHODIMP BSCBStorageBind::OnDataAvailable(DWORD flags, DWORD size,
@@ skipping 74 matching lines @@
   if (data_sniffer_.is_chrome()) {
     // Remember clip format.  If we are switching to chrome, then in order
     // to make mshtml return INET_E_TERMINATED_BIND and reissue navigation
     // with the same bind context, we have to return a mime type that is
     // special cased by mshtml.
     static const CLIPFORMAT kMagicClipFormat =
         RegisterClipboardFormat(CFSTR_MIME_MPEG);
     clip_format_ = kMagicClipFormat;
   } else {
     if (!saved_progress_.empty()) {
-      for (std::vector<Progress>::iterator i = saved_progress_.begin();
-          i != saved_progress_.end(); i++) {
-        const wchar_t* status_text = i->status_text_.empty() ?
-            NULL : i->status_text_.c_str();
-        CallbackImpl::OnProgress(i->progress_, i->progress_max_,
-                                 i->status_code_, status_text);
+      for (std::vector<Progress*>::iterator i = saved_progress_.begin();
+           i != saved_progress_.end(); i++) {
+        Progress* p = (*i);
+        CallbackImpl::OnProgress(p->progress(), p->progress_max(),
+                                 p->status_code(), p->status_text());
+        delete p;
       }
       saved_progress_.clear();
     }
   }
 
   if (data_sniffer_.is_cache_valid()) {
     if (data_sniffer_.is_chrome()) {
       scoped_refptr<BindContextInfo> info =
           BindContextInfo::FromBindContext(bind_ctx_);
       DCHECK(info);
@@ skipping 43 matching lines @@
       case BINDSTATUS_CACHEFILENAMEAVAILABLE:
       case BINDSTATUS_SERVER_MIMETYPEAVAILABLE:
         return true;
       default:
         break;
     }
   }
 
   return false;
 }