Change ContentSettingsType's scoping type and hookup migration code

chrome/browser/browsing_data/cookies_tree_model_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/browsing_data/cookies_tree_model.h"
 
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 1411 matching lines @@
       CookieSettingsFactory::GetForProfile(&profile).get();
   MockSettingsObserver observer(content_settings);
 
   CookieTreeRootNode* root =
       static_cast<CookieTreeRootNode*>(cookies_model.GetRoot());
   CookieTreeHostNode* origin =
       root->GetOrCreateHostNode(host);
 
   EXPECT_EQ(1, origin->child_count());
   EXPECT_TRUE(origin->CanCreateContentException());
-  EXPECT_CALL(observer, OnContentSettingsChanged(
-                            content_settings, CONTENT_SETTINGS_TYPE_COOKIES,
-                            false, ContentSettingsPattern::FromURL(host),
-                            ContentSettingsPattern::Wildcard(), false))
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(
+                  content_settings, CONTENT_SETTINGS_TYPE_COOKIES, false,
+                  ContentSettingsPattern::FromURLNoWildcard(host),
+                  ContentSettingsPattern::Wildcard(), false))
       .Times(2);
   origin->CreateContentException(
       cookie_settings, CONTENT_SETTING_SESSION_ONLY);
   EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(host, host));
   EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(host));
 }
 
 TEST_F(CookiesTreeModelTest, FileSystemFilter) {
   std::unique_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
@@ skipping 201 matching lines @@
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy());
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL(), "A=1");
   mock_browsing_data_cookie_helper_->Notify();
   EXPECT_EQ("A", GetDisplayedCookies(&cookies_model));
 }
 
 }  // namespace