Stop inheriting push notification permissions from regular to incognito

chrome/browser/extensions/api/content_settings/content_settings_store_unittest.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/extensions/api/content_settings/content_settings_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"

[raymes, 2015/12/07 03:02:30]

How come you added this?

[johnme, 2015/12/07 11:28:51]

Oops - removed.

+#include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using ::testing::Mock;
 
 namespace extensions {
 
 namespace {
 
@@ skipping 28 matching lines @@
 
 ContentSetting GetContentSettingFromStore(
     const ContentSettingsStore* store,
     const GURL& primary_url, const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito) {
   scoped_ptr<content_settings::RuleIterator> rule_iterator(
       store->GetRuleIterator(content_type, resource_identifier, incognito));
   scoped_ptr<base::Value> setting(
-      content_settings::GetContentSettingValueAndPatterns(
+      content_settings::TestUtils::GetContentSettingValueAndPatterns(
           rule_iterator.get(), primary_url, secondary_url, NULL, NULL));
   return content_settings::ValueToContentSetting(setting.get());
 }
 
 void GetSettingsForOneTypeFromStore(
     const ContentSettingsStore* store,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito,
     std::vector<content_settings::Rule>* rules) {
@@ skipping 175 matching lines @@
 
   // Uninstall second extension.
   store()->UnregisterExtension(ext_id_2);
 
   GetSettingsForOneTypeFromStore(
       store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
   ASSERT_EQ(0u, rules.size());
 }
 
 }  // namespace extensions