ContentSettings API should not interact with <webview>

chrome/renderer/content_settings_observer.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/renderer/content_settings_observer.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ skipping 43 matching lines @@
     DCHECK(rules[0].secondary_pattern == ContentSettingsPattern::Wildcard());
     return rules[0].setting;
   }
   const GURL& primary_url = GetOriginOrURL(frame);
   for (it = rules.begin(); it != rules.end(); ++it) {
     if (it->primary_pattern.Matches(primary_url) &&
         it->secondary_pattern.Matches(secondary_url)) {
       return it->setting;
     }
   }
-  NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
 }  // namespace
 
 ContentSettingsObserver::ContentSettingsObserver(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<ContentSettingsObserver>(render_view),
       content_setting_rules_(NULL),
@@ skipping 283 matching lines @@
 
   if (EqualsASCII(origin.protocol(), chrome::kChromeDevToolsScheme))
     return true;  // DevTools UI elements should still work.
 
   if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
     return true;
 
   if (EqualsASCII(origin.protocol(), chrome::kChromeInternalScheme))
     return true;
 
+  // TODO(creis, fsamuel): Remove this once the concept of swapped out
+  // RenderViews goes away.
+  if (EqualsASCII(origin.protocol(), GURL(content::kSwappedOutURL).scheme()))

[jochen (gone - plz use gerrit), 2013/12/03 15:35:07]

doesn't document_url == GURL(content::kSwappedOutURL) work?

[Fady Samuel, 2013/12/03 15:56:26]

It does. Changed.

+    return true;
+
   // If the scheme is file:, an empty file name indicates a directory listing,
   // which requires JavaScript to function properly.
   if (EqualsASCII(origin.protocol(), chrome::kFileScheme)) {
     return document_url.SchemeIs(chrome::kFileScheme) &&
            document_url.ExtractFileName().empty();
   }
 
   return false;
 }