Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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 <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/automation/automation_autocomplete_edit_tracker.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/automation/ui_controls.h"
-#include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
+#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 1917 matching lines @@
       else
         browser->window()->GetDownloadShelf()->Close();
     }
   }
 }
 
 void TestingAutomationProvider::GetBlockedPopupCount(int handle, int* count) {
   *count = -1;  // -1 is the error code
   if (tab_tracker_->ContainsHandle(handle)) {
       NavigationController* nav_controller = tab_tracker_->GetResource(handle);
-      TabContents* tab_contents = nav_controller->tab_contents();
+      TabContentsWrapper* tab_contents =
+          TabContentsWrapper::GetCurrentWrapperForContents(
+              nav_controller->tab_contents());
       if (tab_contents) {
-        BlockedContentContainer* container =
-            tab_contents->blocked_content_container();
-        if (container) {
-          *count = static_cast<int>(container->GetBlockedContentsCount());
-        } else {
-          // If we don't have a container, we don't have any blocked popups to
-          // contain!
-          *count = 0;
-        }
+        BlockedContentTabHelper* blocked_content =
+            tab_contents->blocked_content_tab_helper();
+        *count = static_cast<int>(blocked_content->GetBlockedContentsCount());
       }
   }
 }
 
 void TestingAutomationProvider::SendJSONRequest(int handle,
                                                 const std::string& json_request,
                                                 IPC::Message* reply_message) {
   scoped_ptr<Value> values;
   base::JSONReader reader;
   std::string error;
@@ skipping 1504 matching lines @@
 
   remover->AddObserver(
       new AutomationProviderBrowsingDataObserver(this, reply_message));
   remover->Remove(remove_mask);
   // BrowsingDataRemover deletes itself using DeleteTask.
   // The observer also deletes itself after sending the reply.
 }
 
 namespace {
 
-  // Get the TabContents from a dictionary of arguments.
-  TabContents* GetTabContentsFromDict(const Browser* browser,
-                                      const DictionaryValue* args,
-                                      std::string* error_message) {
-    int tab_index;
-    if (!args->GetInteger("tab_index", &tab_index)) {
-      *error_message = "Must include tab_index.";
-      return NULL;
-    }
-
-    TabContents* tab_contents = browser->GetTabContentsAt(tab_index);
-    if (!tab_contents) {
-      *error_message = StringPrintf("No tab at index %d.", tab_index);
-      return NULL;
-    }
-    return tab_contents;
+// Get the TabContentsWrapper from a dictionary of arguments.
+TabContentsWrapper* GetTabContentsWrapperFromDict(const Browser* browser,
+                                                  const DictionaryValue* args,
+                                                  std::string* error_message) {
+  int tab_index;
+  if (!args->GetInteger("tab_index", &tab_index)) {
+    *error_message = "Must include tab_index.";
+    return NULL;
   }
 
-  // Get the TranslateInfoBarDelegate from TabContents.
-  TranslateInfoBarDelegate* GetTranslateInfoBarDelegate(
-      TabContents* tab_contents) {
-    for (size_t i = 0; i < tab_contents->infobar_count(); i++) {
-      InfoBarDelegate* infobar = tab_contents->GetInfoBarDelegateAt(i);
-      if (infobar->AsTranslateInfoBarDelegate())
-        return infobar->AsTranslateInfoBarDelegate();
-    }
-    // No translate infobar.
+  TabContentsWrapper* tab_contents =
+      browser->GetTabContentsWrapperAt(tab_index);
+  if (!tab_contents) {
+    *error_message = StringPrintf("No tab at index %d.", tab_index);
     return NULL;
   }
+  return tab_contents;
+}
+
+// Get the TranslateInfoBarDelegate from TabContents.
+TranslateInfoBarDelegate* GetTranslateInfoBarDelegate(
+    TabContents* tab_contents) {
+  for (size_t i = 0; i < tab_contents->infobar_count(); i++) {
+    InfoBarDelegate* infobar = tab_contents->GetInfoBarDelegateAt(i);
+    if (infobar->AsTranslateInfoBarDelegate())
+      return infobar->AsTranslateInfoBarDelegate();
+  }
+  // No translate infobar.
+  return NULL;
+}
+
 }  // namespace
 
 void TestingAutomationProvider::FindInPage(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string error_message;
-  TabContents* tab_contents = GetTabContentsFromDict(browser, args,
-                                                     &error_message);
+  TabContentsWrapper* tab_contents =
+      GetTabContentsWrapperFromDict(browser, args, &error_message);
   if (!tab_contents) {
     AutomationJSONReply(this, reply_message).SendError(error_message);
     return;
   }
   string16 search_string;
   bool forward;
   bool match_case;
   bool find_next;
   if (!args->GetString("search_string", &search_string)) {
     AutomationJSONReply(this, reply_message).
         SendError("Must include search_string string.");
     return;
   }
   if (!args->GetBoolean("forward", &forward)) {
     AutomationJSONReply(this, reply_message).
         SendError("Must include forward boolean.");
     return;
   }
   if (!args->GetBoolean("match_case", &match_case)) {
     AutomationJSONReply(this, reply_message).
         SendError("Must include match_case boolean.");
     return;
   }
   if (!args->GetBoolean("find_next", &find_next)) {
     AutomationJSONReply(this, reply_message).
         SendError("Must include find_next boolean.");
     return;
   }
-  SendFindRequest(tab_contents,
+  SendFindRequest(tab_contents->tab_contents(),
                   true,
                   search_string,
                   forward,
                   match_case,
                   find_next,
                   reply_message);
 }
 
 // See GetTranslateInfo() in chrome/test/pyautolib/pyauto.py for sample json
 // input and output.
 void TestingAutomationProvider::GetTranslateInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string error_message;
-  TabContents* tab_contents = GetTabContentsFromDict(browser, args,
-                                                     &error_message);
-  if (!tab_contents) {
+  TabContentsWrapper* tab_contents_wrapper =
+      GetTabContentsWrapperFromDict(browser, args, &error_message);
+  if (!tab_contents_wrapper) {
     AutomationJSONReply(this, reply_message).SendError(error_message);
     return;
   }
 
+  TabContents* tab_contents = tab_contents_wrapper->tab_contents();
   // Get the translate bar if there is one and pass it to the observer.
   // The observer will check for null and populate the information accordingly.
   TranslateInfoBarDelegate* translate_bar =
       GetTranslateInfoBarDelegate(tab_contents);
 
   TabLanguageDeterminedObserver* observer = new TabLanguageDeterminedObserver(
       this, reply_message, tab_contents, translate_bar);
   // If the language for the page hasn't been loaded yet, then just make
   // the observer, otherwise call observe directly.
   TranslateTabHelper* helper = TabContentsWrapper::GetCurrentWrapperForContents(
       tab_contents)->translate_tab_helper();
   std::string language = helper->language_state().original_language();
   if (!language.empty()) {
     observer->Observe(NotificationType::TAB_LANGUAGE_DETERMINED,
                       Source<TabContents>(tab_contents),
                       Details<std::string>(&language));
   }
 }
 
 // See SelectTranslateOption() in chrome/test/pyautolib/pyauto.py for sample
 // json input.
 // Sample json output: {}
 void TestingAutomationProvider::SelectTranslateOption(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string option;
   std::string error_message;
-  TabContents* tab_contents = GetTabContentsFromDict(browser, args,
-                                                     &error_message);
-  if (!tab_contents) {
+  TabContentsWrapper* tab_contents_wrapper =
+      GetTabContentsWrapperFromDict(browser, args, &error_message);
+  if (!tab_contents_wrapper) {
     AutomationJSONReply(this, reply_message).SendError(error_message);
     return;
   }
 
+  TabContents* tab_contents = tab_contents_wrapper->tab_contents();
   TranslateInfoBarDelegate* translate_bar =
       GetTranslateInfoBarDelegate(tab_contents);
   if (!translate_bar) {
     AutomationJSONReply(this, reply_message)
         .SendError("There is no translate bar open.");
     return;
   }
 
   if (!args->GetString("option", &option)) {
     AutomationJSONReply(this, reply_message).SendError("Must include option");
@@ skipping 93 matching lines @@
 
 // Sample json input: { "command": "GetBlockedPopupsInfo",
 //                      "tab_index": 1 }
 // Refer GetBlockedPopupsInfo() in pyauto.py for sample output.
 void TestingAutomationProvider::GetBlockedPopupsInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   std::string error_message;
-  TabContents* tab_contents = GetTabContentsFromDict(
+  TabContentsWrapper* tab_contents = GetTabContentsWrapperFromDict(
       browser, args, &error_message);
   if (!tab_contents) {
     reply.SendError(error_message);
     return;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  BlockedContentContainer* popup_container =
-      tab_contents->blocked_content_container();
+  BlockedContentTabHelper* blocked_content =
+      tab_contents->blocked_content_tab_helper();
   ListValue* blocked_popups_list = new ListValue;
-  if (popup_container) {
-    std::vector<TabContents*> blocked_contents;
-    popup_container->GetBlockedContents(&blocked_contents);
-    for (std::vector<TabContents*>::const_iterator it =
-             blocked_contents.begin(); it != blocked_contents.end(); ++it) {
-      DictionaryValue* item = new DictionaryValue;
-      item->SetString("url", (*it)->GetURL().spec());
-      item->SetString("title", (*it)->GetTitle());
-      blocked_popups_list->Append(item);
-    }
+  std::vector<TabContentsWrapper*> blocked_contents;
+  blocked_content->GetBlockedContents(&blocked_contents);
+  for (std::vector<TabContentsWrapper*>::const_iterator it =
+           blocked_contents.begin(); it != blocked_contents.end(); ++it) {
+    DictionaryValue* item = new DictionaryValue;
+    item->SetString("url", (*it)->tab_contents()->GetURL().spec());
+    item->SetString("title", (*it)->tab_contents()->GetTitle());
+    blocked_popups_list->Append(item);
   }
   return_value->Set("blocked_popups", blocked_popups_list);
   reply.SendSuccess(return_value.get());
 }
 
 // Refer UnblockAndLaunchBlockedPopup() in pyauto.py for sample input.
 void TestingAutomationProvider::UnblockAndLaunchBlockedPopup(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   std::string error_message;
-  TabContents* tab_contents = GetTabContentsFromDict(
+  TabContentsWrapper* tab_contents = GetTabContentsWrapperFromDict(
       browser, args, &error_message);
   if (!tab_contents) {
     reply.SendError(error_message);
     return;
   }
   int popup_index;
   if (!args->GetInteger("popup_index", &popup_index)) {
     reply.SendError("Need popup_index arg");
     return;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  BlockedContentContainer* content_container =
-      tab_contents->blocked_content_container();
-  if (!content_container ||
-      popup_index >= (int)content_container->GetBlockedContentsCount()) {
+  BlockedContentTabHelper* blocked_content =
+      tab_contents->blocked_content_tab_helper();
+  if (popup_index >= (int)blocked_content->GetBlockedContentsCount()) {
     reply.SendError(StringPrintf("No popup at index %d", popup_index));
     return;
   }
-  std::vector<TabContents*> blocked_contents;
-  content_container->GetBlockedContents(&blocked_contents);
-  content_container->LaunchForContents(blocked_contents[popup_index]);
+  std::vector<TabContentsWrapper*> blocked_contents;
+  blocked_content->GetBlockedContents(&blocked_contents);
+  blocked_content->LaunchForContents(blocked_contents[popup_index]);
   reply.SendSuccess(NULL);
 }
 
 // Sample json input: { "command": "GetThemeInfo" }
 // Refer GetThemeInfo() in chrome/test/pyautolib/pyauto.py for sample output.
 void TestingAutomationProvider::GetThemeInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
@@ skipping 1676 matching lines @@
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }