Update callers of WebSecurityOrigin::isEmpty to call WebSecurityOrigin::isUnique

chrome/renderer/content_settings_observer.cc

 // Copyright (c) 2011 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 "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
@@ skipping 14 matching lines @@
 using WebKit::WebURL;
 using WebKit::WebView;
 using content::DocumentState;
 using content::NavigationState;
 
 namespace {
 
 // True if |frame| contains content that is white-listed for content settings.
 static bool IsWhitelistedForContentSettings(WebFrame* frame) {
   WebSecurityOrigin origin = frame->document().securityOrigin();
-  if (origin.isEmpty())
+  if (origin.isUnique())
     return false;  // Uninitialized document?
 
   if (EqualsASCII(origin.protocol(), chrome::kChromeUIScheme))
     return true;  // Browser UI elements should still work.
 
   if (EqualsASCII(origin.protocol(), chrome::kChromeDevToolsScheme))
     return true;  // DevTools UI elements should still work.
 
   // If the scheme is ftp: or file:, an empty file name indicates a directory
   // listing, which requires JavaScript to function properly.
@@ skipping 108 matching lines @@
   // If we start failing this DCHECK, please makes sure we don't regress
   // this bug: http://code.google.com/p/chromium/issues/detail?id=79304
   DCHECK(frame->document().securityOrigin().toString() == "null" ||
          !url.SchemeIs(chrome::kDataScheme));
 }
 
 bool ContentSettingsObserver::AllowDatabase(WebFrame* frame,
                                             const WebString& name,
                                             const WebString& display_name,
                                             unsigned long estimated_size) {
-  if (frame->document().securityOrigin().isEmpty() ||
-      frame->top()->document().securityOrigin().isEmpty())
-    return false; // Uninitialized document.
+  if (frame->document().securityOrigin().isUnique() ||
+      frame->top()->document().securityOrigin().isUnique())
+    return false;
 
   bool result = false;
   Send(new ChromeViewHostMsg_AllowDatabase(
       routing_id(), GURL(frame->document().securityOrigin().toString()),
       GURL(frame->top()->document().securityOrigin().toString()),
       name, display_name, &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) {
-  if (frame->document().securityOrigin().isEmpty() ||
-      frame->top()->document().securityOrigin().isEmpty())
-    return false; // Uninitialized document.
+  if (frame->document().securityOrigin().isUnique() ||
+      frame->top()->document().securityOrigin().isUnique())
+    return false;
 
   bool result = false;
   Send(new ChromeViewHostMsg_AllowFileSystem(
       routing_id(), GURL(frame->document().securityOrigin().toString()),
       GURL(frame->top()->document().securityOrigin().toString()), &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowImage(WebFrame* frame,
                                          bool enabled_per_settings,
@@ skipping 10 matching lines @@
   }
 
   if (!allow)
     DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES, std::string());
   return allow;
 }
 
 bool ContentSettingsObserver::AllowIndexedDB(WebFrame* frame,
                                              const WebString& name,
                                              const WebSecurityOrigin& origin) {
-  if (frame->document().securityOrigin().isEmpty() ||
-      frame->top()->document().securityOrigin().isEmpty())
-    return false; // Uninitialized document.
+  if (frame->document().securityOrigin().isUnique() ||
+      frame->top()->document().securityOrigin().isUnique())
+    return false;
 
   bool result = false;
   Send(new ChromeViewHostMsg_AllowIndexedDB(
       routing_id(), GURL(frame->document().securityOrigin().toString()),
       GURL(frame->top()->document().securityOrigin().toString()),
       name, &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowPlugins(WebFrame* frame,
@@ skipping 40 matching lines @@
     ContentSetting setting = GetContentSettingFromRules(
         content_setting_rules_->script_rules,
         frame,
         GURL(script_url));
     allow = setting != CONTENT_SETTING_BLOCK;
   }
   return allow || IsWhitelistedForContentSettings(frame);
 }
 
 bool ContentSettingsObserver::AllowStorage(WebFrame* frame, bool local) {
-  if (frame->document().securityOrigin().isEmpty() ||
-      frame->top()->document().securityOrigin().isEmpty())
-    return false; // Uninitialized document.
+  if (frame->document().securityOrigin().isUnique() ||
+      frame->top()->document().securityOrigin().isUnique())
+    return false;
   bool result = false;
 
   StoragePermissionsKey key(
       GURL(frame->document().securityOrigin().toString()), local);
   std::map<StoragePermissionsKey, bool>::const_iterator permissions =
       cached_storage_permissions_.find(key);
   if (permissions != cached_storage_permissions_.end())
     return permissions->second;
 
   Send(new ChromeViewHostMsg_AllowDOMStorage(
@@ skipping 16 matching lines @@
 void ContentSettingsObserver::OnLoadBlockedPlugins() {
   plugins_temporarily_allowed_ = true;
 }
 
 void ContentSettingsObserver::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
   cached_storage_permissions_.clear();
   cached_script_permissions_.clear();
 }