Convert cookie and download automation commands to the JSON interface.

chrome/test/pyautolib/pyautolib.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 "base/base_paths.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
@@ skipping 84 matching lines @@
   std::string homepage_original;
   std::swap(homepage_original, homepage_);
 
   UITestBase::SetLaunchSwitches();
 
   // However, we *do* want the --homepage switch.
   std::swap(homepage_original, homepage_);
   launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_);
 }
 
-void PyUITestBase::SetDownloadShelfVisible(bool is_visible, int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  ASSERT_TRUE(browser_proxy.get());
-  EXPECT_TRUE(browser_proxy->SetShelfVisible(is_visible));
-}
-
-bool PyUITestBase::IsDownloadShelfVisible(int window_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  EXPECT_TRUE(browser_proxy.get());
-  if (!browser_proxy.get())
-    return false;
-  bool visible = false;
-  EXPECT_TRUE(browser_proxy->IsShelfVisible(&visible));
-  return visible;
-}
-
 void PyUITestBase::OpenFindInPage(int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   ASSERT_TRUE(browser_proxy.get());
   EXPECT_TRUE(browser_proxy->OpenFindInPage());
 }
 
 bool PyUITestBase::IsFindInPageVisible(int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   EXPECT_TRUE(browser_proxy.get());
   if (!browser_proxy.get())
     return false;
   bool is_visible;
   EXPECT_TRUE(browser_proxy->IsFindWindowFullyVisible(&is_visible));
   return is_visible;
 }
 
-FilePath PyUITestBase::GetDownloadDirectory() {
-  FilePath download_dir;
-  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-  EXPECT_TRUE(tab_proxy.get());
-  if (!tab_proxy.get())
-    return download_dir;
-  EXPECT_TRUE(tab_proxy->GetDownloadDirectory(&download_dir));
-  return download_dir;
-}
-
 bool PyUITestBase::OpenNewBrowserWindow(bool show) {
   return automation()->OpenNewBrowserWindow(Browser::TYPE_TABBED, show);
 }
 
 bool PyUITestBase::CloseBrowserWindow(int window_index) {
   scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
   if (!browser_proxy.get())
     return false;
   bool app_closed;
   return CloseBrowser(browser_proxy.get(), &app_closed);
@@ skipping 195 matching lines @@
         request, response);
   } else {
     // TODO(craigdh): Determine specific cause.
     ErrorResponse("Chrome failed to respond", request, response);
   }
 }
 
 bool PyUITestBase::ResetToDefaultTheme() {
   return automation()->ResetToDefaultTheme();
 }
-
-bool PyUITestBase::SetCookie(const GURL& cookie_url,
-                             const std::string& value,
-                             int window_index,
-                             int tab_index) {
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  EXPECT_TRUE(browser_proxy.get());
-  if (!browser_proxy.get())
-    return false;
-  scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
-  EXPECT_TRUE(tab_proxy.get());
-  if (!tab_proxy.get())
-    return false;
-  return tab_proxy->SetCookie(cookie_url, value);
-}
-
-std::string PyUITestBase::GetCookie(const GURL& cookie_url,
-                                    int window_index,
-                                    int tab_index) {
-  std::string cookie_val;
-  scoped_refptr<BrowserProxy> browser_proxy = GetBrowserWindow(window_index);
-  EXPECT_TRUE(browser_proxy.get());
-  // TODO(phadjan.jr): figure out a way to unambiguously report error.
-  if (!browser_proxy.get())
-    return cookie_val;
-  scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
-  EXPECT_TRUE(tab_proxy.get());
-  if (!tab_proxy.get())
-    return cookie_val;
-  EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));
-  return cookie_val;
-}