5 files changed, 10 insertions, 8 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3636f98..6dcd2cc 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3727,6 +3727,7 @@
           ],
           'cflags': [
              '-Wno-uninitialized',
+             '-Wno-self-assign',  # to keep clang happy for generated code.
           ],
           'sources': [
             'test/automation/proxy_launcher.cc',
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index a5c3e0d..a3ce6e0 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -3235,7 +3235,7 @@ class PyUITestSuite(pyautolib.PyUITestSuiteBase, unittest.TestSuite):
     # Figure out path to chromium binaries
     browser_dir = os.path.normpath(os.path.dirname(pyautolib.__file__))
     logging.debug('Loading pyauto libs from %s', browser_dir)
-    self.Initialize(pyautolib.FilePath(browser_dir))
+    self.InitializeWithPath(pyautolib.FilePath(browser_dir))
     os.environ['PATH'] = browser_dir + os.pathsep + os.environ['PATH']
 
     unittest.TestSuite.__init__(self)
diff --git a/chrome/test/pyautolib/pyautolib.cc b/chrome/test/pyautolib/pyautolib.cc
index 814c820..3591253 100644
--- a/chrome/test/pyautolib/pyautolib.cc
+++ b/chrome/test/pyautolib/pyautolib.cc
@@ -27,7 +27,7 @@ PyUITestSuiteBase::~PyUITestSuiteBase() {
   Shutdown();
 }
 
-void PyUITestSuiteBase::Initialize(const FilePath& browser_dir) {
+void PyUITestSuiteBase::InitializeWithPath(const FilePath& browser_dir) {
   SetBrowserDirectory(browser_dir);
   UITestSuite::Initialize();
 }
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index 9a15614..cd5aa22 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -26,9 +26,9 @@
 class PyUITestSuiteBase : public UITestSuite {
  public:
   PyUITestSuiteBase(int argc, char** argv);
-  ~PyUITestSuiteBase();
+  virtual ~PyUITestSuiteBase();
 
-  void Initialize(const FilePath& browser_dir);
+  void InitializeWithPath(const FilePath& browser_dir);
 
   void SetCrSourceRoot(const FilePath& path);
 
@@ -44,7 +44,7 @@ class PyUITestBase : public UITestBase {
 
   // Constructor. Lookup pyauto.py for doc on these args.
   PyUITestBase(bool clear_profile, std::wstring homepage);
-  ~PyUITestBase();
+  virtual ~PyUITestBase();
 
   // Initialize the setup. Should be called before launching the browser.
   // |browser_dir| is the path to dir containing chromium binaries.
diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i
index b132130..739e0ea 100644
--- a/chrome/test/pyautolib/pyautolib.i
+++ b/chrome/test/pyautolib/pyautolib.i
@@ -167,10 +167,11 @@ class PyUITestSuiteBase {
  public:
   %feature("docstring", "Create the suite.") PyUITestSuiteBase;
   PyUITestSuiteBase(int argc, char** argv);
-  ~PyUITestSuiteBase();
+  virtual ~PyUITestSuiteBase();
 
-  %feature("docstring", "Initialize from the path to browser dir.") Initialize;
-  void Initialize(const FilePath& browser_dir);
+  %feature("docstring", "Initialize from the path to browser dir.")
+      InitializeWithPath;
+  void InitializeWithPath(const FilePath& browser_dir);
   %feature("docstring", "Set chrome source root path, used in some tests")
       SetCrSourceRoot;
   void SetCrSourceRoot(const FilePath& path);