diff options
Diffstat (limited to 'chrome/browser')
9 files changed, 45 insertions, 456 deletions
diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc index 6684b48..fd6f12a 100644 --- a/chrome/browser/automation/automation_provider_json.cc +++ b/chrome/browser/automation/automation_provider_json.cc @@ -13,13 +13,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/automation_id.h" #include "chrome/common/automation_messages.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" -using automation::Error; -using automation::ErrorCode; using content::WebContents; AutomationJSONReply::AutomationJSONReply(AutomationProvider* provider, @@ -44,19 +41,10 @@ void AutomationJSONReply::SendSuccess(const Value* value) { } void AutomationJSONReply::SendError(const std::string& error_message) { - SendError(Error(error_message)); -} - -void AutomationJSONReply::SendErrorCode(ErrorCode code) { - SendError(Error(code)); -} - -void AutomationJSONReply::SendError(const Error& error) { DCHECK(message_) << "Resending reply for JSON automation request"; base::DictionaryValue dict; - dict.SetString("error", error.message()); - dict.SetInteger("code", error.code()); + dict.SetString("error", error_message); std::string json; base::JSONWriter::Write(&dict, &json); @@ -69,32 +57,15 @@ bool GetBrowserFromJSONArgs( DictionaryValue* args, Browser** browser, std::string* error) { - if (args->HasKey("auto_id")) { - AutomationId id; - if (!GetAutomationIdFromJSONArgs(args, "auto_id", &id, error)) - return false; - WebContents* tab; - if (!automation_util::GetTabForId(id, &tab)) { - *error = "'auto_id' does not refer to an open tab"; - return false; - } - Browser* container = automation_util::GetBrowserForTab(tab); - if (!container) { - *error = "tab does not belong to an open browser"; - return false; - } - *browser = container; - } else { - int browser_index; - if (!args->GetInteger("windex", &browser_index)) { - *error = "'windex' missing or invalid"; - return false; - } - *browser = automation_util::GetBrowserAt(browser_index); - if (!*browser) { - *error = "Cannot locate browser from given index"; - return false; - } + int browser_index; + if (!args->GetInteger("windex", &browser_index)) { + *error = "'windex' missing or invalid"; + return false; + } + *browser = automation_util::GetBrowserAt(browser_index); + if (!*browser) { + *error = "Cannot locate browser from given index"; + return false; } return true; } @@ -103,29 +74,19 @@ bool GetTabFromJSONArgs( DictionaryValue* args, WebContents** tab, std::string* error) { - if (args->HasKey("auto_id")) { - AutomationId id; - if (!GetAutomationIdFromJSONArgs(args, "auto_id", &id, error)) - return false; - if (!automation_util::GetTabForId(id, tab)) { - *error = "'auto_id' does not refer to an open tab"; - return false; - } - } else { - int browser_index, tab_index; - if (!args->GetInteger("windex", &browser_index)) { - *error = "'windex' missing or invalid"; - return false; - } - if (!args->GetInteger("tab_index", &tab_index)) { - *error = "'tab_index' missing or invalid"; - return false; - } - *tab = automation_util::GetWebContentsAt(browser_index, tab_index); - if (!*tab) { - *error = "Cannot locate tab from given indices"; - return false; - } + int browser_index, tab_index; + if (!args->GetInteger("windex", &browser_index)) { + *error = "'windex' missing or invalid"; + return false; + } + if (!args->GetInteger("tab_index", &tab_index)) { + *error = "'tab_index' missing or invalid"; + return false; + } + *tab = automation_util::GetWebContentsAt(browser_index, tab_index); + if (!*tab) { + *error = "Cannot locate tab from given indices"; + return false; } return true; } @@ -139,40 +100,15 @@ bool GetBrowserAndTabFromJSONArgs( GetTabFromJSONArgs(args, tab, error); } -bool GetAutomationIdFromJSONArgs( - DictionaryValue* args, - const std::string& key, - AutomationId* id, - std::string* error) { - Value* id_value; - if (!args->Get(key, &id_value)) { - *error = base::StringPrintf("Missing parameter '%s'", key.c_str()); - return false; - } - return AutomationId::FromValue(id_value, id, error); -} - bool GetRenderViewFromJSONArgs( DictionaryValue* args, Profile* profile, content::RenderViewHost** rvh, std::string* error) { - Value* id_value; - if (args->Get("auto_id", &id_value)) { - AutomationId id; - if (!AutomationId::FromValue(id_value, &id, error)) - return false; - if (!automation_util::GetRenderViewForId(id, profile, rvh)) { - *error = "ID does not correspond to an open view"; - return false; - } - } else { - // If the render view id is not specified, check for browser/tab indices. - WebContents* tab = NULL; - if (!GetTabFromJSONArgs(args, &tab, error)) - return false; - *rvh = tab->GetRenderViewHost(); - } + WebContents* tab = NULL; + if (!GetTabFromJSONArgs(args, &tab, error)) + return false; + *rvh = tab->GetRenderViewHost(); return true; } diff --git a/chrome/browser/automation/automation_provider_json.h b/chrome/browser/automation/automation_provider_json.h index c8817b2..428fa4d 100644 --- a/chrome/browser/automation/automation_provider_json.h +++ b/chrome/browser/automation/automation_provider_json.h @@ -12,7 +12,6 @@ #include "base/compiler_specific.h" #include "chrome/common/automation_constants.h" -class AutomationId; class AutomationProvider; class Browser; class Profile; @@ -53,13 +52,6 @@ class AutomationJSONReply { // Send an error reply along with error message |error_message|. void SendError(const std::string& error_message); - // Send an error reply along with the specified error code and its - // associated error message. - void SendErrorCode(automation::ErrorCode code); - - // Send an automation error. - void SendError(const automation::Error& error); - private: AutomationProvider* provider_; IPC::Message* message_; @@ -90,14 +82,6 @@ bool GetBrowserAndTabFromJSONArgs(base::DictionaryValue* args, content::WebContents** tab, std::string* error) WARN_UNUSED_RESULT; -// Gets an automation ID from the given value in the given dicitionary |args|. -// Returns true on success and sets |id|. Otherwise, |error| will be set. -bool GetAutomationIdFromJSONArgs( - base::DictionaryValue* args, - const std::string& key, - AutomationId* id, - std::string* error) WARN_UNUSED_RESULT; - // Gets the render view specified by the given dictionary |args|. |args| // should contain a key 'view_id' which refers to an automation ID for the // render view. Returns true on success and sets |rvh|. Otherwise, |error| diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 34fc6ac..09e4380 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -1123,7 +1123,7 @@ void DomOperationObserver::Observe( if (dom_op_details->automation_id == automation_id_) OnDomOperationCompleted(dom_op_details->json); } else if (type == chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN) { - OnModalDialogShown(); + OnJavascriptBlocked(); } else { DCHECK_EQ(chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED, type); WebContents* web_contents = content::Source<WebContents>(source).ptr(); @@ -1166,14 +1166,6 @@ void DomOperationMessageSender::OnDomOperationCompleted( delete this; } -void DomOperationMessageSender::OnModalDialogShown() { - if (automation_.get() && use_json_interface_) { - AutomationJSONReply(automation_.get(), reply_message_.release()) - .SendErrorCode(automation::kBlockedByModalDialog); - delete this; - } -} - void DomOperationMessageSender::OnJavascriptBlocked() { if (automation_.get() && use_json_interface_) { AutomationJSONReply(automation_.get(), reply_message_.release()) diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index a1ea47e..198389e 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -580,7 +580,6 @@ class DomOperationObserver : public content::NotificationObserver { const content::NotificationDetails& details) OVERRIDE; virtual void OnDomOperationCompleted(const std::string& json) = 0; - virtual void OnModalDialogShown() = 0; virtual void OnJavascriptBlocked() = 0; private: @@ -600,7 +599,6 @@ class DomOperationMessageSender : public DomOperationObserver { virtual ~DomOperationMessageSender(); virtual void OnDomOperationCompleted(const std::string& json) OVERRIDE; - virtual void OnModalDialogShown() OVERRIDE; virtual void OnJavascriptBlocked() OVERRIDE; private: diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 3313186..7b42e6c 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -29,7 +29,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/automation_id.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" @@ -51,10 +50,6 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #endif -#if defined(ENABLE_FULL_PRINTING) -#include "chrome/browser/printing/print_preview_dialog_controller.h" -#endif - using content::BrowserThread; using content::RenderViewHost; using content::WebContents; @@ -469,182 +464,9 @@ void SetCookieJSON(AutomationProvider* provider, bool SendErrorIfModalDialogActive(AutomationProvider* provider, IPC::Message* message) { bool active = AppModalDialogQueue::GetInstance()->HasActiveDialog(); - if (active) { - AutomationJSONReply(provider, message).SendErrorCode( - automation::kBlockedByModalDialog); - } + if (active) + AutomationJSONReply(provider, message).SendError("Blocked by modal dialog"); return active; } -AutomationId GetIdForTab(const WebContents* tab) { - const SessionTabHelper* session_tab_helper = - SessionTabHelper::FromWebContents(tab); - return AutomationId(AutomationId::kTypeTab, - base::IntToString(session_tab_helper->session_id().id())); -} - -AutomationId GetIdForExtensionView( - const content::RenderViewHost* render_view_host) { - AutomationId::Type type; - WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - switch (extensions::GetViewType(web_contents)) { - case extensions::VIEW_TYPE_EXTENSION_POPUP: - type = AutomationId::kTypeExtensionPopup; - break; - case extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: - type = AutomationId::kTypeExtensionBgPage; - break; - case extensions::VIEW_TYPE_EXTENSION_INFOBAR: - type = AutomationId::kTypeExtensionInfobar; - break; - case extensions::VIEW_TYPE_APP_SHELL: - type = AutomationId::kTypeAppShell; - break; - default: - type = AutomationId::kTypeInvalid; - break; - } - // Since these extension views do not permit navigation, using the - // renderer process and view ID should suffice. - std::string id = base::StringPrintf("%d|%d", - render_view_host->GetRoutingID(), - render_view_host->GetProcess()->GetID()); - return AutomationId(type, id); -} - -AutomationId GetIdForExtension(const extensions::Extension* extension) { - return AutomationId(AutomationId::kTypeExtension, extension->id()); -} - -bool GetTabForId(const AutomationId& id, WebContents** tab) { - if (id.type() != AutomationId::kTypeTab) - return false; - -#if defined(ENABLE_FULL_PRINTING) - printing::PrintPreviewDialogController* preview_controller = - printing::PrintPreviewDialogController::GetInstance(); -#endif - for (chrome::BrowserIterator it; !it.done(); it.Next()) { - Browser* browser = *it; - for (int tab_index = 0; - tab_index < browser->tab_strip_model()->count(); - ++tab_index) { - WebContents* web_contents = - browser->tab_strip_model()->GetWebContentsAt(tab_index); - SessionTabHelper* session_tab_helper = - SessionTabHelper::FromWebContents(web_contents); - if (base::IntToString( - session_tab_helper->session_id().id()) == id.id()) { - *tab = web_contents; - return true; - } - -#if defined(ENABLE_FULL_PRINTING) - if (preview_controller) { - WebContents* print_preview_contents = - preview_controller->GetPrintPreviewForContents(web_contents); - if (print_preview_contents) { - SessionTabHelper* preview_session_tab_helper = - SessionTabHelper::FromWebContents(print_preview_contents); - std::string preview_id = base::IntToString( - preview_session_tab_helper->session_id().id()); - if (preview_id == id.id()) { - *tab = print_preview_contents; - return true; - } - } - } -#endif - } - } - return false; -} - -namespace { - -bool GetExtensionRenderViewForId( - const AutomationId& id, - Profile* profile, - RenderViewHost** rvh) { - ExtensionProcessManager* extension_mgr = - extensions::ExtensionSystem::Get(profile)->process_manager(); - const ExtensionProcessManager::ViewSet view_set = - extension_mgr->GetAllViews(); - for (ExtensionProcessManager::ViewSet::const_iterator iter = view_set.begin(); - iter != view_set.end(); ++iter) { - content::RenderViewHost* host = *iter; - AutomationId this_id = GetIdForExtensionView(host); - if (id == this_id) { - *rvh = host; - return true; - } - } - return false; -} - -} // namespace - -bool GetRenderViewForId( - const AutomationId& id, - Profile* profile, - RenderViewHost** rvh) { - switch (id.type()) { - case AutomationId::kTypeTab: { - WebContents* tab; - if (!GetTabForId(id, &tab)) - return false; - *rvh = tab->GetRenderViewHost(); - break; - } - case AutomationId::kTypeExtensionPopup: - case AutomationId::kTypeExtensionBgPage: - case AutomationId::kTypeExtensionInfobar: - case AutomationId::kTypeAppShell: - if (!GetExtensionRenderViewForId(id, profile, rvh)) - return false; - break; - default: - return false; - } - return true; -} - -bool GetExtensionForId( - const AutomationId& id, - Profile* profile, - const extensions::Extension** extension) { - if (id.type() != AutomationId::kTypeExtension) - return false; - ExtensionService* service = extensions::ExtensionSystem::Get(profile)-> - extension_service(); - const extensions::Extension* installed_extension = - service->GetInstalledExtension(id.id()); - if (installed_extension) - *extension = installed_extension; - return !!installed_extension; -} - -bool DoesObjectWithIdExist(const AutomationId& id, Profile* profile) { - switch (id.type()) { - case AutomationId::kTypeTab: { - WebContents* tab; - return GetTabForId(id, &tab); - } - case AutomationId::kTypeExtensionPopup: - case AutomationId::kTypeExtensionBgPage: - case AutomationId::kTypeExtensionInfobar: - case AutomationId::kTypeAppShell: { - RenderViewHost* rvh; - return GetExtensionRenderViewForId(id, profile, &rvh); - } - case AutomationId::kTypeExtension: { - const extensions::Extension* extension; - return GetExtensionForId(id, profile, &extension); - } - default: - break; - } - return false; -} - } // namespace automation_util diff --git a/chrome/browser/automation/automation_util.h b/chrome/browser/automation/automation_util.h index 79322e9..9252a89 100644 --- a/chrome/browser/automation/automation_util.h +++ b/chrome/browser/automation/automation_util.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" -class AutomationId; class AutomationProvider; class Browser; class GURL; @@ -94,32 +93,6 @@ void SetCookieJSON(AutomationProvider* provider, bool SendErrorIfModalDialogActive(AutomationProvider* provider, IPC::Message* message); -// Returns a valid automation ID for the given tab. -AutomationId GetIdForTab(const content::WebContents* tab); - -// Returns a valid automation ID for the extension view. -AutomationId GetIdForExtensionView( - const content::RenderViewHost* render_view_host); - -// Returns a valid automation ID for the extension. -AutomationId GetIdForExtension(const extensions::Extension* extension); - -// Gets the tab for the given ID. Returns true on success. -bool GetTabForId(const AutomationId& id, content::WebContents** tab); - -// Gets the render view for the given ID. Returns true on success. -bool GetRenderViewForId(const AutomationId& id, - Profile* profile, - content::RenderViewHost** rvh); - -// Gets the extension for the given ID. Returns true on success. -bool GetExtensionForId(const AutomationId& id, - Profile* profile, - const extensions::Extension** extension); - -// Returns whether the given ID refers to an actual automation entity. -bool DoesObjectWithIdExist(const AutomationId& id, Profile* profile); - } // namespace automation_util #endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_UTIL_H_ diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 2eb3b0a..c42c266 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -108,7 +108,6 @@ #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/startup/startup_types.h" #include "chrome/common/automation_constants.h" -#include "chrome/common/automation_id.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -165,12 +164,6 @@ #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" #endif // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -#if defined(ENABLE_FULL_PRINTING) -#include "chrome/browser/printing/print_preview_dialog_controller.h" -#endif - -using automation::Error; -using automation::ErrorCode; using automation_util::SendErrorIfModalDialogActive; using content::BrowserChildProcessHostIterator; using content::BrowserContext; @@ -1647,12 +1640,8 @@ void TestingAutomationProvider::BuildJSONHandlerMaps() { handler_map_["GetTabIds"] = &TestingAutomationProvider::GetTabIds; - handler_map_["GetViews"] = - &TestingAutomationProvider::GetViews; handler_map_["IsTabIdValid"] = &TestingAutomationProvider::IsTabIdValid; - handler_map_["DoesAutomationObjectExist"] = - &TestingAutomationProvider::DoesAutomationObjectExist; handler_map_["CloseTab"] = &TestingAutomationProvider::CloseTabJSON; handler_map_["SetViewBounds"] = @@ -1685,8 +1674,6 @@ void TestingAutomationProvider::BuildJSONHandlerMaps() { &TestingAutomationProvider::ActionOnSSLBlockingPage; handler_map_["GetSecurityState"] = &TestingAutomationProvider::GetSecurityState; - handler_map_["GetChromeDriverAutomationVersion"] = - &TestingAutomationProvider::GetChromeDriverAutomationVersion; handler_map_["IsPageActionVisible"] = &TestingAutomationProvider::IsPageActionVisible; handler_map_["CreateNewAutomationProvider"] = @@ -4198,11 +4185,11 @@ namespace { // Gets the active JavaScript modal dialog, or NULL if none. JavaScriptAppModalDialog* GetActiveJavaScriptModalDialog( - ErrorCode* error_code) { + std::string* error_msg) { AppModalDialogQueue* dialog_queue = AppModalDialogQueue::GetInstance(); if (!dialog_queue->HasActiveDialog() || !dialog_queue->active_dialog()->IsJavaScriptModalDialog()) { - *error_code = automation::kNoJavaScriptModalDialogOpen; + *error_msg = "No JavaScriptModalDialog open"; return NULL; } return static_cast<JavaScriptAppModalDialog*>(dialog_queue->active_dialog()); @@ -4213,10 +4200,10 @@ JavaScriptAppModalDialog* GetActiveJavaScriptModalDialog( void TestingAutomationProvider::GetAppModalDialogMessage( DictionaryValue* args, IPC::Message* reply_message) { AutomationJSONReply reply(this, reply_message); - ErrorCode code; - JavaScriptAppModalDialog* dialog = GetActiveJavaScriptModalDialog(&code); + std::string error_msg; + JavaScriptAppModalDialog* dialog = GetActiveJavaScriptModalDialog(&error_msg); if (!dialog) { - reply.SendErrorCode(code); + reply.SendError(error_msg); return; } DictionaryValue result_dict; @@ -4233,10 +4220,10 @@ void TestingAutomationProvider::AcceptOrDismissAppModalDialog( return; } - ErrorCode code; - JavaScriptAppModalDialog* dialog = GetActiveJavaScriptModalDialog(&code); + std::string error_msg; + JavaScriptAppModalDialog* dialog = GetActiveJavaScriptModalDialog(&error_msg); if (!dialog) { - reply.SendErrorCode(code); + reply.SendError(error_msg); return; } if (accept) { @@ -4740,8 +4727,7 @@ void TestingAutomationProvider::ExecuteJavascriptJSON( std::string error; RenderViewHost* render_view; if (!GetRenderViewFromJSONArgs(args, profile(), &render_view, &error)) { - AutomationJSONReply(this, reply_message).SendError( - Error(automation::kInvalidId, error)); + AutomationJSONReply(this, reply_message).SendError(error); return; } if (!args->GetString("frame_xpath", &frame_xpath)) { @@ -5223,58 +5209,6 @@ void TestingAutomationProvider::GetTabIds( AutomationJSONReply(this, reply_message).SendSuccess(&dict); } -void TestingAutomationProvider::GetViews( - DictionaryValue* args, IPC::Message* reply_message) { - ListValue* view_list = new ListValue(); -#if defined(ENABLE_FULL_PRINTING) - printing::PrintPreviewDialogController* preview_controller = - printing::PrintPreviewDialogController::GetInstance(); -#endif - for (chrome::BrowserIterator it; !it.done(); it.Next()) { - Browser* browser = *it; - for (int i = 0; i < browser->tab_strip_model()->count(); ++i) { - WebContents* contents = browser->tab_strip_model()->GetWebContentsAt(i); - DictionaryValue* dict = new DictionaryValue(); - AutomationId id = automation_util::GetIdForTab(contents); - dict->Set("auto_id", id.ToValue()); - view_list->Append(dict); -#if defined(ENABLE_FULL_PRINTING) - if (preview_controller) { - WebContents* preview_dialog = - preview_controller->GetPrintPreviewForContents(contents); - if (preview_dialog) { - DictionaryValue* dict = new DictionaryValue(); - AutomationId id = automation_util::GetIdForTab(preview_dialog); - dict->Set("auto_id", id.ToValue()); - view_list->Append(dict); - } - } -#endif - } - } - - ExtensionProcessManager* extension_mgr = - extensions::ExtensionSystem::Get(profile())->process_manager(); - const ExtensionProcessManager::ViewSet all_views = - extension_mgr->GetAllViews(); - ExtensionProcessManager::ViewSet::const_iterator iter; - for (iter = all_views.begin(); iter != all_views.end(); ++iter) { - content::RenderViewHost* host = (*iter); - AutomationId id = automation_util::GetIdForExtensionView(host); - if (!id.is_valid()) - continue; - const Extension* extension = - extension_mgr->GetExtensionForRenderViewHost(host); - DictionaryValue* dict = new DictionaryValue(); - dict->Set("auto_id", id.ToValue()); - dict->SetString("extension_id", extension->id()); - view_list->Append(dict); - } - DictionaryValue dict; - dict.Set("views", view_list); - AutomationJSONReply(this, reply_message).SendSuccess(&dict); -} - void TestingAutomationProvider::IsTabIdValid( DictionaryValue* args, IPC::Message* reply_message) { AutomationJSONReply reply(this, reply_message); @@ -5301,22 +5235,6 @@ void TestingAutomationProvider::IsTabIdValid( reply.SendSuccess(&dict); } -void TestingAutomationProvider::DoesAutomationObjectExist( - DictionaryValue* args, IPC::Message* reply_message) { - AutomationJSONReply reply(this, reply_message); - AutomationId id; - std::string error_msg; - if (!GetAutomationIdFromJSONArgs(args, "auto_id", &id, &error_msg)) { - reply.SendError(error_msg); - return; - } - DictionaryValue dict; - dict.SetBoolean( - "does_exist", - automation_util::DoesObjectWithIdExist(id, profile())); - reply.SendSuccess(&dict); -} - void TestingAutomationProvider::CloseTabJSON( DictionaryValue* args, IPC::Message* reply_message) { Browser* browser; @@ -5360,7 +5278,7 @@ void TestingAutomationProvider::SetViewBounds( Browser* browser; std::string error; if (!GetBrowserFromJSONArgs(args, &browser, &error)) { - reply.SendError(Error(automation::kInvalidId, error)); + reply.SendError(error); return; } BrowserWindow* browser_window = browser->window(); @@ -5377,8 +5295,7 @@ void TestingAutomationProvider::MaximizeView( Browser* browser; std::string error; if (!GetBrowserFromJSONArgs(args, &browser, &error)) { - AutomationJSONReply(this, reply_message) - .SendError(Error(automation::kInvalidId, error)); + AutomationJSONReply(this, reply_message).SendError(error); return; } @@ -5463,14 +5380,6 @@ void TestingAutomationProvider::IsPageActionVisible( reply.SendSuccess(&dict); } -void TestingAutomationProvider::GetChromeDriverAutomationVersion( - DictionaryValue* args, - IPC::Message* reply_message) { - DictionaryValue reply_dict; - reply_dict.SetInteger("version", automation::kChromeDriverAutomationVersion); - AutomationJSONReply(this, reply_message).SendSuccess(&reply_dict); -} - void TestingAutomationProvider::CreateNewAutomationProvider( DictionaryValue* args, IPC::Message* reply_message) { diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index 989ace7..5129527 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/chrome/browser/automation/testing_automation_provider.h @@ -934,31 +934,12 @@ class TestingAutomationProvider : public AutomationProvider, // output: { "ids": [213, 1] } void GetTabIds(base::DictionaryValue* args, IPC::Message* reply_message); - // Gets info about all open views. Each view ID is unique per session. - // Example: - // input: none - // output: { "views": [ - // { - // "auto_id": { "type": 0, "id": "awoein" }, - // "extension_id": "askjeoias3" // optional - // } - // ] - // } - void GetViews(base::DictionaryValue* args, IPC::Message* reply_message); - // Checks if the given tab ID refers to an open tab. // Example: // input: { "id": 41 } // output: { "is_valid": false } void IsTabIdValid(base::DictionaryValue* args, IPC::Message* reply_message); - // Checks if the given automation ID refers to an actual object. - // Example: - // input: { "auto_id": { "type": 0, "id": "awoein" } } - // output: { "does_exist": false } - void DoesAutomationObjectExist( - base::DictionaryValue* args, IPC::Message* reply_message); - // Closes the specified tab. // The pair |windex| and |tab_index| or the single |auto_id| must be given // to specify the tab. @@ -1182,13 +1163,6 @@ class TestingAutomationProvider : public AutomationProvider, void BringBrowserToFrontJSON(base::DictionaryValue* args, IPC::Message* message); - // Gets the version of ChromeDriver automation supported by this server. - // Example: - // input: none - // output: { "version": 1 } - void GetChromeDriverAutomationVersion(base::DictionaryValue* args, - IPC::Message* message); - // Determines whether the extension page action is visible in the given tab. // Example: // input: { "auto_id": { "type": 0, "id": "awoein" }, diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index 5c5e43c..bb9c69d 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc @@ -14,7 +14,6 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/pref_names.h" -#include "chrome/test/automation/value_conversion_util.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" @@ -159,9 +158,11 @@ void TemplateURLServiceTestUtilBase::SetManagedDefaultSearchPreferences( Value::CreateStringValue(icon_url)); pref_service->SetManagedPref(prefs::kDefaultSearchProviderEncodings, Value::CreateStringValue(encodings)); + scoped_ptr<base::ListValue> alternate_url_list(new base::ListValue()); + if (!alternate_url.empty()) + alternate_url_list->Append(Value::CreateStringValue(alternate_url)); pref_service->SetManagedPref(prefs::kDefaultSearchProviderAlternateURLs, - alternate_url.empty() ? new base::ListValue() : - CreateListValueFrom(alternate_url)); + alternate_url_list.release()); pref_service->SetManagedPref( prefs::kDefaultSearchProviderSearchTermsReplacementKey, Value::CreateStringValue(search_terms_replacement_key)); |