Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/extensions/api/browsing_data/browsing_data_test.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 <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 213 matching lines @@
                                  BrowsingDataRemover::REMOVE_INDEXEDDB) |
                        GetAsMask(data_to_remove, "localStorage",
                                  BrowsingDataRemover::REMOVE_LOCAL_STORAGE) |
                        GetAsMask(data_to_remove, "pluginData",
                                  BrowsingDataRemover::REMOVE_PLUGIN_DATA) |
                        GetAsMask(data_to_remove, "passwords",
                                  BrowsingDataRemover::REMOVE_PASSWORDS) |
                        GetAsMask(data_to_remove, "webSQL",
                                  BrowsingDataRemover::REMOVE_WEBSQL) |
                        GetAsMask(data_to_remove, "serverBoundCertificates",
-                           BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
+                           BrowsingDataRemover::REMOVE_CHANNEL_IDS);
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
   // The kAllowDeletingBrowserHistory pref must be set to false before this
   // is called.
   void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
     scoped_refptr<BrowsingDataRemoveFunction> function =
         new BrowsingDataRemoveFunction();
     std::string args = "[{\"since\": 1}," + data_types + "]";
 
@@ skipping 118 matching lines @@
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "formData", BrowsingDataRemover::REMOVE_FORM_DATA);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "history", BrowsingDataRemover::REMOVE_HISTORY);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "indexedDB", BrowsingDataRemover::REMOVE_INDEXEDDB);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "localStorage", BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "serverBoundCertificates",
-      BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
+      BrowsingDataRemover::REMOVE_CHANNEL_IDS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
 }
 
 // Test an arbitrary combination of data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMaskCombination) {
@@ skipping 49 matching lines @@
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, ShortcutFunctionRemovalMask) {
   RunAndCompareRemovalMask<BrowsingDataRemoveAppcacheFunction>(
       BrowsingDataRemover::REMOVE_APPCACHE);
   RunAndCompareRemovalMask<BrowsingDataRemoveCacheFunction>(
       BrowsingDataRemover::REMOVE_CACHE);
   RunAndCompareRemovalMask<BrowsingDataRemoveCookiesFunction>(
       BrowsingDataRemover::REMOVE_COOKIES |
-      BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
+      BrowsingDataRemover::REMOVE_CHANNEL_IDS);
   RunAndCompareRemovalMask<BrowsingDataRemoveDownloadsFunction>(
       BrowsingDataRemover::REMOVE_DOWNLOADS);
   RunAndCompareRemovalMask<BrowsingDataRemoveFileSystemsFunction>(
       BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
   RunAndCompareRemovalMask<BrowsingDataRemoveFormDataFunction>(
       BrowsingDataRemover::REMOVE_FORM_DATA);
   RunAndCompareRemovalMask<BrowsingDataRemoveHistoryFunction>(
       BrowsingDataRemover::REMOVE_HISTORY);
   RunAndCompareRemovalMask<BrowsingDataRemoveIndexedDBFunction>(
       BrowsingDataRemover::REMOVE_INDEXEDDB);
@@ skipping 64 matching lines @@
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HISTORY |
           BrowsingDataRemover::REMOVE_DOWNLOADS,
     UNPROTECTED_WEB,
     site_data_no_plugins |
         BrowsingDataRemover::REMOVE_HISTORY |
         BrowsingDataRemover::REMOVE_DOWNLOADS);
 }