Remove NOTIFICATION_RENDER_VIEW_HOST_CHANGED.

chrome/browser/file_select_helper.cc

 // Copyright (c) 2012 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/browser/file_select_helper.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 67 matching lines @@
 struct FileSelectHelper::ActiveDirectoryEnumeration {
   ActiveDirectoryEnumeration() : rvh_(NULL) {}
 
   scoped_ptr<DirectoryListerDispatchDelegate> delegate_;
   scoped_ptr<net::DirectoryLister> lister_;
   RenderViewHost* rvh_;
   std::vector<base::FilePath> results_;
 };
 
 FileSelectHelper::FileSelectHelper(Profile* profile)
-    : profile_(profile),
+    : content::WebContentsObserver(),
+      profile_(profile),
       render_view_host_(NULL),
       web_contents_(NULL),
       select_file_dialog_(),
       select_file_types_(),
       dialog_type_(ui::SelectFileDialog::SELECT_OPEN_FILE),
       dialog_mode_(FileChooserParams::Open) {
 }
 
 FileSelectHelper::~FileSelectHelper() {
   // There may be pending file dialogs, we need to tell them that we've gone
@@ skipping 186 matching lines @@
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::DeleteTemporaryFiles() {
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&DeleteFiles, temporary_files_));
   temporary_files_.clear();
 }
 
+void FileSelectHelper::CleanUpOnRenderViewHostChange() {
+  if (!temporary_files_.empty()) {
+    DeleteTemporaryFiles();
+
+    // Now that the temporary files have been scheduled for deletion, there
+    // is no longer any reason to keep this instance around.
+    Release();
+  }
+}
+
 scoped_ptr<ui::SelectFileDialog::FileTypeInfo>
 FileSelectHelper::GetFileTypesFromAcceptType(
     const std::vector<base::string16>& accept_types) {
   scoped_ptr<ui::SelectFileDialog::FileTypeInfo> base_file_type(
       new ui::SelectFileDialog::FileTypeInfo());
   if (accept_types.empty())
     return base_file_type.Pass();
 
   // Create FileTypeInfo and pre-allocate for the first extension list.
   scoped_ptr<ui::SelectFileDialog::FileTypeInfo> file_type(
@@ skipping 78 matching lines @@
 }
 
 void FileSelectHelper::RunFileChooser(RenderViewHost* render_view_host,
                                       content::WebContents* web_contents,
                                       const FileChooserParams& params) {
   DCHECK(!render_view_host_);
   DCHECK(!web_contents_);
   render_view_host_ = render_view_host;
   web_contents_ = web_contents;
   notification_registrar_.RemoveAll();
-  notification_registrar_.Add(this,
-                              content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-                              content::Source<WebContents>(web_contents_));
+  content::WebContentsObserver::Observe(web_contents_);
   notification_registrar_.Add(
       this,
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       content::Source<RenderWidgetHost>(render_view_host_));
-  notification_registrar_.Add(
-      this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
-      content::Source<WebContents>(web_contents_));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&FileSelectHelper::RunFileChooserOnFileThread, this, params));
 
   // Because this class returns notifications to the RenderViewHost, it is
   // difficult for callers to know how long to keep a reference to this
   // instance. We AddRef() here to keep the instance alive after we return
   // to the caller, until the last callback is received from the file dialog.
   // At that point, we must call RunFileChooserEnd().
@@ skipping 114 matching lines @@
 void FileSelectHelper::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED: {
       DCHECK(content::Source<RenderWidgetHost>(source).ptr() ==
              render_view_host_);
       render_view_host_ = NULL;
       break;
     }
-
-    case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: {
-      DCHECK(content::Source<WebContents>(source).ptr() == web_contents_);
-      web_contents_ = NULL;
-    }
-
-    // Intentional fall through.
-    case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED:
-      if (!temporary_files_.empty()) {
-        DeleteTemporaryFiles();
-
-        // Now that the temporary files have been scheduled for deletion, there
-        // is no longer any reason to keep this instance around.
-        Release();
-      }
-
-      break;
-
     default:
       NOTREACHED();
   }
 }
 
+void FileSelectHelper::RenderViewHostChanged(RenderViewHost* old_host,
+                                             RenderViewHost* new_host) {
+  CleanUpOnRenderViewHostChange();
+}
+
+void FileSelectHelper::WebContentsDestroyed() {
+  web_contents_ = NULL;

[Avi (use Gerrit), 2015/05/11 19:05:00]

nullptr

[lazyboy, 2015/05/11 19:22:53]

Done.

+  CleanUpOnRenderViewHostChange();
+}
+
 // static
 bool FileSelectHelper::IsAcceptTypeValid(const std::string& accept_type) {
   // TODO(raymes): This only does some basic checks, extend to test more cases.
   // A 1 character accept type will always be invalid (either a "." in the case
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
       base::StringToLowerASCII(accept_type) != accept_type ||
       base::TrimWhitespaceASCII(accept_type, base::TRIM_ALL, &unused) !=
           base::TRIM_NONE) {
     return false;
   }
   return true;
 }