Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER.

components/content_settings/core/browser/content_settings_provider.h

 // 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.
 
 // Interface for objects providing content setting rules.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_
 
-#define NO_RESOURCE_IDENTIFIER std::string()
-
 #include <string>
 
 #include "base/values.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
 class ContentSettingsPattern;
 
 namespace content_settings {
 
 struct Rule;
 class RuleIterator;
 
 typedef std::string ResourceIdentifier;

[msramek, 2015/04/07 12:01:40]

ResourceIdentifier is still defined here, so all those files still need to
include provider.h. Please move this to content_settings.h.

Please consider also removing this shadowing definition:
https://code.google.com/p/chromium/codesearch#chromium/src/components/content...

[Deepak, 2015/04/07 13:08:14]

On 2015/04/07 12:01:40, msramek wrote:

Done.

 
 class ProviderInterface {
  public:
   virtual ~ProviderInterface() {}
 
   // Returns a |RuleIterator| over the content setting rules stored by this
   // provider. If |incognito| is true, the iterator returns only the content
   // settings which are applicable to the incognito mode and differ from the
   // normal mode. Otherwise, it returns the content settings for the normal
   // mode. The caller takes the ownership of the returned |RuleIterator|. It is
@@ skipping 31 matching lines @@
   // Detaches the Provider from all Profile-related objects like PrefService.
   // This methods needs to be called before destroying the Profile.
   // Afterwards, none of the methods above that should only be called on the UI
   // thread should be called anymore.
   virtual void ShutdownOnUIThread() = 0;
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_