Do not reset the content settings delegate's cookies when a network error occurred.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2010 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/automation/testing_automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 237 matching lines @@
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_CloseBrowser, CloseBrowser)
     IPC_MESSAGE_HANDLER(AutomationMsg_CloseBrowserRequestAsync,
                         CloseBrowserAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_ActivateTab, ActivateTab)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_AppendTab, AppendTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ActiveTabIndex, GetActiveTabIndex)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_CloseTab, CloseTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetCookies, GetCookies)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetCookie, SetCookie)
     IPC_MESSAGE_HANDLER(AutomationMsg_DeleteCookie, DeleteCookie)
+    IPC_MESSAGE_HANDLER(AutomationMsg_IsContentBlocked, IsContentBlocked)
+    IPC_MESSAGE_HANDLER(AutomationMsg_IsContentAccessed, IsContentAccessed)
     IPC_MESSAGE_HANDLER(AutomationMsg_ShowCollectedCookiesDialog,
                         ShowCollectedCookiesDialog)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_NavigateToURL, NavigateToURL)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_NavigateToURLBlockUntilNavigationsComplete,
         NavigateToURLBlockUntilNavigationsComplete)
     IPC_MESSAGE_HANDLER(AutomationMsg_NavigationAsync, NavigationAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_NavigationAsyncWithDisposition,
                         NavigationAsyncWithDisposition)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_GoBack, GoBack)
@@ skipping 300 matching lines @@
     NavigationController* tab = tab_tracker_->GetResource(handle);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         new DeleteCookieTask(
             url, cookie_name,
             make_scoped_refptr(tab->profile()->GetRequestContext())));
     *success = true;
   }
 }
 
+void TestingAutomationProvider::IsContentBlocked(
+    int handle,
+    ContentSettingsType content_type,
+    bool* is_blocked,
+    bool* success) {
+  *success = false;
+  if (tab_tracker_->ContainsHandle(handle)) {
+    TabSpecificContentSettings* content_settings = tab_tracker_->
+        GetResource(handle)->tab_contents()->GetTabSpecificContentSettings();
+    *is_blocked = content_settings->IsContentBlocked(content_type);
+    *success = true;
+  }
+}
+
+void TestingAutomationProvider::IsContentAccessed(
+    int handle,
+    ContentSettingsType content_type,
+    bool* is_accessed,
+    bool* success) {
+  *success = false;
+  if (tab_tracker_->ContainsHandle(handle)) {
+    TabSpecificContentSettings* content_settings = tab_tracker_->
+        GetResource(handle)->tab_contents()->GetTabSpecificContentSettings();
+    *is_accessed = content_settings->IsContentAccessed(content_type);
+    *success = true;
+  }
+}
+
 void TestingAutomationProvider::ShowCollectedCookiesDialog(
     int handle, bool* success) {
   *success = false;
   if (tab_tracker_->ContainsHandle(handle)) {
     TabContents* tab_contents =
         tab_tracker_->GetResource(handle)->tab_contents();
     tab_contents->delegate()->ShowCollectedCookiesDialog(tab_contents);
     *success = true;
   }
 }
@@ skipping 3980 matching lines @@
   DCHECK(type == NotificationType::SESSION_END);
   // OnBrowserRemoved does a ReleaseLater. When session end is received we exit
   // before the task runs resulting in this object not being deleted. This
   // Release balance out the Release scheduled by OnBrowserRemoved.
   Release();
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }