Revert r8560 due to broken interactive_ui_tests

Review URL: http://codereview.chromium.org/18722

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8570 0039d316-1c4b-4281-b951-d872f2087c98

base/process_util.h

@@ -61,9 +61,6 @@ int GetCurrentProcId();
 // Returns the ProcessHandle of the current process.
 ProcessHandle GetCurrentProcessHandle();
 
-// Closes given process handle. Returns true on success.
-bool CloseProcessHandle(ProcessHandle process);
-
 // Returns the unique ID for the specified process. This is functionally the
 // same as Windows' GetProcessId(), but works on versions of Windows before
 // Win XP SP1 as well.

base/process_util_posix.cc

@@ -30,10 +30,6 @@ ProcessHandle GetCurrentProcessHandle() {
   return GetCurrentProcId();
 }
 
-bool CloseProcessHandle(ProcessHandle process) {
-  return true;
-}
-
 int GetProcId(ProcessHandle process) {
   return process;
 }

base/process_util_win.cc

@@ -33,10 +33,6 @@ ProcessHandle GetCurrentProcessHandle() {
   return ::GetCurrentProcess();
 }
 
-bool CloseProcessHandle(ProcessHandle process) {
-  return ::CloseHandle(process) ? true : false;
-}
-
 // Helper for GetProcId()
 bool GetProcIdViaGetProcessId(ProcessHandle process, DWORD* id) {
   // Dynamically get a pointer to GetProcessId().
@@ -192,7 +188,7 @@ bool DidProcessCrash(ProcessHandle handle) {
 
   // Warning, this is not generic code; it heavily depends on the way
   // the rest of the code kills a process.
-
+  
   if (exitcode == PROCESS_END_NORMAL_TERMINATON ||
       exitcode == PROCESS_END_KILLED_BY_USER ||
       exitcode == PROCESS_END_PROCESS_WAS_HUNG ||

chrome/browser/base_history_model.cc

@@ -23,9 +23,9 @@ const int BaseHistoryModel::kHistoryScopeMonths = 18;
 BaseHistoryModel::BaseHistoryModel(Profile* profile)
     : profile_(profile),
       observer_(NULL),
-      is_search_results_(false),
       thumbnails_(kThumbnailCacheSize),
-      favicons_(kThumbnailCacheSize) {
+      favicons_(kThumbnailCacheSize),
+      is_search_results_(false) {
   if (!kDefaultFavicon) {
     kDefaultFavicon = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_DEFAULT_FAVICON);

chrome/browser/bookmarks/bookmark_utils.h

@@ -42,9 +42,6 @@ void CloneDragData(BookmarkModel* model,
                    BookmarkNode* parent,
                    int index_to_add_at);
 
-#if defined(OS_WIN)
-// TODO(port): Make OpenAll portable (remove HWND).
-
 // Recursively opens all bookmarks. |initial_disposition| dictates how the
 // first URL is opened, all subsequent URLs are opened as background tabs.
 // |navigator| is used to open the URLs. If |navigator| is NULL the last
@@ -62,7 +59,6 @@ void OpenAll(HWND parent,
              PageNavigator* navigator,
              BookmarkNode* node,
              WindowOpenDisposition initial_disposition);
-#endif  // defined(OS_WIN)
 
 // Copies nodes onto the clipboard. If |remove_nodes| is true the nodes are
 // removed after copied to the clipboard. The nodes are copied in such a way

chrome/browser/browser.scons

@@ -673,17 +673,21 @@ if not env.Bit('windows'):
       'autocomplete/autocomplete_edit.cc',
       'autocomplete/autocomplete_popup.cc',
       'autocomplete/edit_drop_target.cc',
+      'autocomplete/history_contents_provider.cc',
       'autocomplete/history_url_provider.cc',
       'autocomplete/search_provider.cc',
       'automation/automation_provider.cc',
       'automation/automation_provider_list.cc',
       'automation/ui_controls.cc',
       'back_forward_menu_model.cc',
+      'base_history_model.cc',
       'bookmarks/bookmark_context_menu.cc',
       'bookmarks/bookmark_drag_data.cc',
       'bookmarks/bookmark_drop_info.cc',
+      'bookmarks/bookmark_folder_tree_model.cc',
       'bookmarks/bookmark_model.cc',
       'bookmarks/bookmark_storage.cc',
+      'bookmarks/bookmark_table_model.cc',
       'bookmarks/bookmark_utils.cc',
       'browser.cc',
       'browser_about_handler.cc',

chrome/common/common.scons

@@ -218,8 +218,13 @@ if not env.Bit('windows'):
       'gfx/icon_util.cc',
       'gfx/path.cc',
       'ipc_logging.cc',
+      'jstemplate_builder.cc',
       'os_exchange_data.cc',
       'plugin_messages.cc',
+      'process_watcher.cc',
+      'security_filter_peer.cc',
+      'win_safe_util.cc',
+      'win_util.cc',
   )
 
 if not env.Bit('windows'):
@@ -230,8 +235,6 @@ if not env.Bit('windows'):
       'gfx/chrome_font_win.cc',
       'ipc_channel_win.cc',
       'resource_bundle_win.cc',
-      'win_safe_util.cc',
-      'win_util.cc',
       '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
   )
 

chrome/common/process_watcher.cc

@@ -4,13 +4,9 @@
 
 #include "chrome/common/process_watcher.h"
 
-#include "base/basictypes.h"
 #include "base/message_loop.h"
-#include "base/process.h"
-#include "base/process_util.h"
+#include "base/object_watcher.h"
 #include "base/sys_info.h"
-#include "base/timer.h"
-#include "base/worker_pool.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/common/env_vars.h"
 
@@ -19,72 +15,80 @@ static const int kWaitInterval = 2000;
 
 namespace {
 
-class TerminatorTask : public Task {
+class TimerExpiredTask : public Task, public base::ObjectWatcher::Delegate {
  public:
-  explicit TerminatorTask(base::ProcessHandle process) : process_(process) {
-    timer_.Start(base::TimeDelta::FromMilliseconds(kWaitInterval),
-                 this, &TerminatorTask::KillProcess);
+  explicit TimerExpiredTask(base::ProcessHandle process) : process_(process) {
+    watcher_.StartWatching(process_, this);
   }
 
-  virtual ~TerminatorTask() {
+  virtual ~TimerExpiredTask() {
     if (process_) {
       KillProcess();
-      DCHECK(!process_);
+      DCHECK(!process_) << "Make sure to close the handle.";
     }
   }
 
+  // Task ---------------------------------------------------------------------
+
   virtual void Run() {
-    base::WaitForSingleProcess(process_, kWaitInterval);
-    timer_.Stop();
     if (process_)
       KillProcess();
   }
 
+  // MessageLoop::Watcher -----------------------------------------------------
+
+  virtual void OnObjectSignaled(HANDLE object) {
+    // When we're called from KillProcess, the ObjectWatcher may still be
+    // watching.  the process handle, so make sure it has stopped.
+    watcher_.StopWatching();
+
+    CloseHandle(process_);
+    process_ = NULL;
+  }
+
  private:
   void KillProcess() {
     if (base::SysInfo::HasEnvVar(env_vars::kHeadless)) {
-      // If running the distributed tests, give the renderer a little time
-      // to figure out that the channel is shutdown and unwind.
-      if (base::WaitForSingleProcess(process_, kWaitInterval)) {
-        Cleanup();
-        return;
-      }
+     // If running the distributed tests, give the renderer a little time
+     // to figure out that the channel is shutdown and unwind.
+     if (WaitForSingleObject(process_, kWaitInterval) == WAIT_OBJECT_0) {
+       OnObjectSignaled(process_);
+       return;
+     }
     }
 
     // OK, time to get frisky.  We don't actually care when the process
-    // terminates.  We just care that it eventually terminates.
-    base::KillProcess(base::Process(process_).pid(),
-                      ResultCodes::HUNG,
-                      false /* don't wait */);
+    // terminates.  We just care that it eventually terminates, and that's what
+    // TerminateProcess should do for us. Don't check for the result code since
+    // it fails quite often. This should be investigated eventually.
+    TerminateProcess(process_, ResultCodes::HUNG);
 
-    Cleanup();
-  }
-
-  void Cleanup() {
-    timer_.Stop();
-    base::CloseProcessHandle(process_);
-    process_ = NULL;
+    // Now, just cleanup as if the process exited normally.
+    OnObjectSignaled(process_);
   }
 
   // The process that we are watching.
   base::ProcessHandle process_;
 
-  base::OneShotTimer<TerminatorTask> timer_;
+  base::ObjectWatcher watcher_;
 
-  DISALLOW_COPY_AND_ASSIGN(TerminatorTask);
+  DISALLOW_EVIL_CONSTRUCTORS(TimerExpiredTask);
 };
 
 }  // namespace
 
 // static
 void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) {
-  DCHECK(base::GetProcId(process) != base::GetCurrentProcId());
+  DCHECK(process != GetCurrentProcess());
 
-  // Check if the process has already exited.
-  if (base::WaitForSingleProcess(process, 0)) {
-    base::CloseProcessHandle(process);
+  // If already signaled, then we are done!
+  if (WaitForSingleObject(process, 0) == WAIT_OBJECT_0) {
+    CloseHandle(process);
     return;
   }
 
-  WorkerPool::PostTask(FROM_HERE, new TerminatorTask(process), true);
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          new TimerExpiredTask(process),
+                                          kWaitInterval);
 }
+

chrome/common/security_filter_peer.h

@@ -50,8 +50,8 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
    SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
                       webkit_glue::ResourceLoaderBridge::Peer* peer);
 
-   webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
    webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
+   webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(SecurityFilterPeer);

chrome/views/table_view.h

@@ -5,11 +5,7 @@
 #ifndef CHROME_VIEWS_TABLE_VIEW_H_
 #define CHROME_VIEWS_TABLE_VIEW_H_
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
 #include <windows.h>
-#endif  // defined(OS_WIN)
 
 #include <map>
 #include <unicode/coll.h>
@@ -18,10 +14,7 @@
 
 #include "base/logging.h"
 #include "chrome/common/l10n_util.h"
-#if defined(OS_WIN)
-// TODO(port): remove the ifdef when native_control.h is ported.
 #include "chrome/views/native_control.h"
-#endif  // defined(OS_WIN)
 #include "SkColor.h"
 
 class SkBitmap;
@@ -291,8 +284,6 @@ class TableViewObserver {
   virtual void OnTableViewDelete(TableView* table_view) {}
 };
 
-#if defined(OS_WIN)
-// TODO(port): Port TableView.
 class TableView : public NativeControl,
                   public TableModelObserver {
  public:
@@ -670,7 +661,6 @@ class TableView : public NativeControl,
 
   DISALLOW_COPY_AND_ASSIGN(TableView);
 };
-#endif  // defined(OS_WIN)
 
 }  // namespace views
 

chrome/views/tree_node_model.h

@@ -189,8 +189,8 @@ class TreeNodeModel : public TreeModel {
   // Creates a TreeNodeModel with the specified root node. The root is owned
   // by the TreeNodeModel.
   explicit TreeNodeModel(NodeType* root)
-      : root_(root),
-        observer_(NULL) {
+      : observer_(NULL),
+        root_(root) {
   }
 
   virtual ~TreeNodeModel() {}