Android: Remove more browser extensions code, including some that snuck back in.

chrome/browser/content_settings/cookie_settings_unittest.cc

Index: chrome/browser/content_settings/cookie_settings_unittest.cc
diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc
index 6e2f274d3ba5a808897f0e43e7c557d1df69c4ca..30b547f7e00d28c04e3add8ccbf9f10dcae3b8fa 100644
--- a/chrome/browser/content_settings/cookie_settings_unittest.cc
+++ b/chrome/browser/content_settings/cookie_settings_unittest.cc
@@ -122,12 +122,6 @@ TEST_F(CookieSettingsTest, CookiesThirdPartyBlockedExplicitAllow) {
       kAllowedSite, kExtensionURL));
   EXPECT_TRUE(cookie_settings_->IsSettingCookieAllowed(
       kAllowedSite, kExtensionURL));
-
-  // Extensions should always be allowed to use cookies.
-  EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(
-      kAllowedSite, kExtensionURL));
-  EXPECT_TRUE(cookie_settings_->IsSettingCookieAllowed(
-      kAllowedSite, kExtensionURL));
 }
 
 TEST_F(CookieSettingsTest, CookiesThirdPartyBlockedAllSitesAllowed) {
@@ -266,9 +260,16 @@ TEST_F(CookieSettingsTest, ExtensionsRegularSettings) {
 TEST_F(CookieSettingsTest, ExtensionsOwnCookies) {
   cookie_settings_->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
 
+#if defined(ENABLE_EXTENSIONS)
   // Extensions can always use cookies (and site data) in their own origin.
   EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(
       kExtensionURL, kExtensionURL));
+#else
+  // Except if extensions are disabled. Then the extension-specific checks do
+  // not exist and the default setting is to block.
+  EXPECT_FALSE(cookie_settings_->IsReadingCookieAllowed(
+      kExtensionURL, kExtensionURL));
+#endif
 }
 
 TEST_F(CookieSettingsTest, ExtensionsThirdParty) {