Porting unit tests in chrome/

- Make following unit tests compile and pass on Linux:
   browser/
    command_updater_unittest.cc
    metrics/metrics_log_unittest.cc
    search_engines/template_url_parser_unittest.cc
    search_engines/template_url_prepopulate_data_unittest.cc

- Add renderer/renderer_main_unittest.cc to list of compiled files (currently stubbed out on Linux)

- Remove DebuggerWrapper stubs and make more files from browser/debugger build on Linux.

- Sync XCode project file.

- Misc cleanups needed for GCC.

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

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

11 files changed, 135 insertions, 71 deletions

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 721ebf2..74c65d6 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -12,6 +12,7 @@
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/app/result_codes.h"
+#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ -424,7 +425,7 @@ bool BrowserInit::ProcessCommandLine(
       if (StringToInt(popup_count_string, &count)) {
         const int popup_count = std::max(0, count);
         AutocompleteResult::set_max_matches(popup_count);
-        AutocompleteProvider::set_max_matches(popup_count / 2);       
+        AutocompleteProvider::set_max_matches(popup_count / 2);
       }
     }
 
@@ -440,7 +441,7 @@ bool BrowserInit::ProcessCommandLine(
         SessionRestore::num_tabs_to_load_ = static_cast<size_t>(tab_count);
       }
     }
-    
+
 #if defined(OS_WIN)
     // Look for the testing channel ID ONLY during process startup
     if (command_line.HasSwitch(switches::kTestingChannelID)) {
@@ -505,7 +506,7 @@ bool BrowserInit::ProcessCommandLine(
   }
   return true;
 }
-  
+
 bool BrowserInit::LaunchBrowser(const CommandLine& command_line,
                                 Profile* profile, const std::wstring& cur_dir,
                                 bool process_startup, int* return_code) {
@@ -538,7 +539,7 @@ bool BrowserInit::LaunchBrowserImpl(const CommandLine& command_line,
                                     bool process_startup,
                                     int* return_code) {
   DCHECK(profile);
-  
+
   // Continue with the off-the-record profile from here on if --incognito
   if (command_line.HasSwitch(switches::kIncognito))
     profile = profile->GetOffTheRecordProfile();
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 42cea7f..7cb57b2 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -10,6 +10,7 @@
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ -29,7 +30,6 @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/common/clipboard_service.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/accelerator_handler.h"
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index df3fb80..0843376 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -60,8 +60,6 @@ if env.Bit('linux'):
   # TODO(port): Port these.
   input_files.Remove(
       'debugger_contents.cc',
-      'debugger_host_impl.cpp',
-      'debugger_node.cc',
       'debugger_shell.cc',
       'debugger_view.cc',
       'debugger_window.cc',
diff --git a/chrome/browser/debugger/debugger_node.cc b/chrome/browser/debugger/debugger_node.cc
index a7f419c..4bfec06 100644
--- a/chrome/browser/debugger/debugger_node.cc
+++ b/chrome/browser/debugger/debugger_node.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/debugger/debugger_shell.h"
 #include "chrome/common/notification_service.h"
 
-DebuggerNode::DebuggerNode() : valid_(true), observing_(false), data_(NULL) {
+DebuggerNode::DebuggerNode() : data_(NULL), valid_(true), observing_(false) {
 }
 
 void DebuggerNode::Observe(NotificationType type,
@@ -131,7 +131,7 @@ ChromeNode::~ChromeNode() {
 v8::Handle<v8::Value> ChromeNode::PropGetter(v8::Handle<v8::String> prop,
                                              const v8::AccessorInfo& info) {
   if (prop->Equals(v8::String::New("pid"))) {
-    return v8::Number::New(GetCurrentProcessId());
+    return v8::Number::New(base::GetCurrentProcId());
   } else if (prop->Equals(v8::String::New("browser"))) {
     BrowserListNode *node = BrowserListNode::BrowserList();
     return node->NewInstance();
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 302ccc3..b78c4c9 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -13,6 +13,7 @@
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
+#include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
@@ -32,11 +33,6 @@
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/autofill_form.h"
 
-#if defined(OS_WIN)
-// TODO(port): remove these when stubs are filled in
-#include "chrome/browser/debugger/debugger_wrapper.h"
-#endif
-
 using base::TimeDelta;
 
 namespace {
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index df293c2..73212b0 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "base/message_loop.h"
+#include "base/process_util.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/chrome_plugin_lib.h"
@@ -143,7 +144,7 @@ void ResourceDispatcherHostTest::MakeTestRequest(int render_process_id,
                                                  const GURL& url) {
   ViewHostMsg_Resource_Request request = CreateResourceRequest("GET", url);
 
-  host_.BeginRequest(this, GetCurrentProcess(), render_process_id,
+  host_.BeginRequest(this, base::GetCurrentProcessHandle(), render_process_id,
                      render_view_id, request_id, request, NULL, NULL);
   KickOffRequest();
 }
@@ -162,7 +163,7 @@ void CheckSuccessfulRequest(const std::vector<IPC::Message>& messages,
   //
   // This function verifies that we received 4 messages and that they
   // are appropriate.
-  ASSERT_EQ(messages.size(), 3);
+  ASSERT_EQ(messages.size(), 3U);
 
   // The first messages should be received response
   ASSERT_EQ(ViewMsg_Resource_ReceivedResponse::ID, messages[0].type());
@@ -176,7 +177,7 @@ void CheckSuccessfulRequest(const std::vector<IPC::Message>& messages,
   ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &request_id));
   base::SharedMemoryHandle shm_handle;
   ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &shm_handle));
-  int data_len;
+  size_t data_len;
   ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &data_len));
 
   ASSERT_EQ(reference_data.size(), data_len);
@@ -210,7 +211,7 @@ TEST_F(ResourceDispatcherHostTest, TestMany) {
   accum_.GetClassifiedMessages(&msgs);
 
   // there are three requests, so we should have gotten them classified as such
-  ASSERT_EQ(3, msgs.size());
+  ASSERT_EQ(3U, msgs.size());
 
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_2());
@@ -239,13 +240,13 @@ TEST_F(ResourceDispatcherHostTest, Cancel) {
   accum_.GetClassifiedMessages(&msgs);
 
   // there are three requests, so we should have gotten them classified as such
-  ASSERT_EQ(3, msgs.size());
+  ASSERT_EQ(3U, msgs.size());
 
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[2], URLRequestTestJob::test_data_3());
 
   // Check that request 2 got canceled.
-  ASSERT_EQ(2, msgs[1].size());
+  ASSERT_EQ(2U, msgs[1].size());
   ASSERT_EQ(ViewMsg_Resource_ReceivedResponse::ID, msgs[1][0].type());
   ASSERT_EQ(ViewMsg_Resource_RequestComplete::ID, msgs[1][1].type());
 
@@ -285,8 +286,8 @@ TEST_F(ResourceDispatcherHostTest, TestProcessCancel) {
 
   EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
 
-  host_.BeginRequest(&test_receiver, GetCurrentProcess(), 0, MSG_ROUTING_NONE,
-                     1, request, NULL, NULL);
+  host_.BeginRequest(&test_receiver, base::GetCurrentProcessHandle(), 0,
+                     MSG_ROUTING_NONE, 1, request, NULL, NULL);
   KickOffRequest();
 
   // request 2 goes to us
@@ -294,8 +295,8 @@ TEST_F(ResourceDispatcherHostTest, TestProcessCancel) {
 
   // request 3 goes to the test delegate
   request.url = URLRequestTestJob::test_url_3();
-  host_.BeginRequest(&test_receiver, GetCurrentProcess(), 0, MSG_ROUTING_NONE,
-                     3, request, NULL, NULL);
+  host_.BeginRequest(&test_receiver, base::GetCurrentProcessHandle(), 0,
+                     MSG_ROUTING_NONE, 3, request, NULL, NULL);
   KickOffRequest();
 
   // TODO(mbelshe):
@@ -324,7 +325,7 @@ TEST_F(ResourceDispatcherHostTest, TestProcessCancel) {
   // we should have gotten exactly one result
   ResourceIPCAccumulator::ClassifiedMessages msgs;
   accum_.GetClassifiedMessages(&msgs);
-  ASSERT_EQ(1, msgs.size());
+  ASSERT_EQ(1U, msgs.size());
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_2());
 }
 
@@ -351,7 +352,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingResumingRequests) {
   accum_.GetClassifiedMessages(&msgs);
 
   // All requests but the 2 for the RVH 0 should have been blocked.
-  ASSERT_EQ(2, msgs.size());
+  ASSERT_EQ(2U, msgs.size());
 
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_3());
@@ -363,7 +364,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingResumingRequests) {
 
   msgs.clear();
   accum_.GetClassifiedMessages(&msgs);
-  ASSERT_EQ(2, msgs.size());
+  ASSERT_EQ(2U, msgs.size());
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_2());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_1());
 
@@ -372,7 +373,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingResumingRequests) {
   while (URLRequestTestJob::ProcessOnePendingMessage());
   msgs.clear();
   accum_.GetClassifiedMessages(&msgs);
-  ASSERT_EQ(1, msgs.size());
+  ASSERT_EQ(1U, msgs.size());
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
 
   // Now resumes requests for all RVH (2 and 3).
@@ -385,7 +386,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingResumingRequests) {
 
   msgs.clear();
   accum_.GetClassifiedMessages(&msgs);
-  ASSERT_EQ(2, msgs.size());
+  ASSERT_EQ(2U, msgs.size());
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_2());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_3());
 }
@@ -409,7 +410,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingCancelingRequests) {
   accum_.GetClassifiedMessages(&msgs);
 
   // The 2 requests for the RVH 0 should have been processed.
-  ASSERT_EQ(2, msgs.size());
+  ASSERT_EQ(2U, msgs.size());
 
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_3());
@@ -423,7 +424,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockingCancelingRequests) {
 
   msgs.clear();
   accum_.GetClassifiedMessages(&msgs);
-  ASSERT_EQ(0, msgs.size());
+  ASSERT_EQ(0U, msgs.size());
 }
 
 // Tests that blocked requests are canceled if their associated process dies.
@@ -452,7 +453,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsProcessDies) {
   accum_.GetClassifiedMessages(&msgs);
 
   // The 2 requests for the RVH 0 should have been processed.
-  ASSERT_EQ(2, msgs.size());
+  ASSERT_EQ(2U, msgs.size());
 
   CheckSuccessfulRequest(msgs[0], URLRequestTestJob::test_data_1());
   CheckSuccessfulRequest(msgs[1], URLRequestTestJob::test_data_3());
@@ -546,7 +547,7 @@ TEST_F(ResourceDispatcherHostTest, TooManyOutstandingRequests) {
   // Expected cost of each request as measured by
   // ResourceDispatcherHost::CalculateApproximateMemoryCost().
   int kMemoryCostOfTest2Req =
-      ResourceDispatcherHost::kAvgBytesPerOutstandingRequest + 
+      ResourceDispatcherHost::kAvgBytesPerOutstandingRequest +
       std::string("GET").size() +
       URLRequestTestJob::test_url_2().spec().size();
 
@@ -556,10 +557,10 @@ TEST_F(ResourceDispatcherHostTest, TooManyOutstandingRequests) {
 
   // Determine how many instance of test_url_2() we can request before
   // throttling kicks in.
-  int kMaxRequests = kMaxCostPerProcess / kMemoryCostOfTest2Req;
+  size_t kMaxRequests = kMaxCostPerProcess / kMemoryCostOfTest2Req;
 
   // Saturate the number of outstanding requests for process 0.
-  for (int i = 0; i < kMaxRequests; ++i)
+  for (size_t i = 0; i < kMaxRequests; ++i)
     MakeTestRequest(0, 0, i + 1, URLRequestTestJob::test_url_2());
 
   // Issue two more requests for process 0 -- these should fail immediately.
@@ -585,7 +586,7 @@ TEST_F(ResourceDispatcherHostTest, TooManyOutstandingRequests) {
   ASSERT_EQ(kMaxRequests + 4, msgs.size());
 
   // Check that the first kMaxRequests succeeded.
-  for (int i = 0; i < kMaxRequests; ++i)
+  for (size_t i = 0; i < kMaxRequests; ++i)
     CheckSuccessfulRequest(msgs[i], URLRequestTestJob::test_data_2());
 
   // Check that the subsequent two requests (kMaxRequests + 1) and
@@ -593,7 +594,7 @@ TEST_F(ResourceDispatcherHostTest, TooManyOutstandingRequests) {
   for (int i = 0; i < 2; ++i) {
     // Should have sent a single RequestComplete message.
     int index = kMaxRequests + i;
-    EXPECT_EQ(1, msgs[index].size());
+    EXPECT_EQ(1U, msgs[index].size());
     EXPECT_EQ(ViewMsg_Resource_RequestComplete::ID, msgs[index][0].type());
 
     // The RequestComplete message should have had status
diff --git a/chrome/browser/site_instance_unittest.cc b/chrome/browser/site_instance_unittest.cc
index d1691fa..71fa4d9 100644
--- a/chrome/browser/site_instance_unittest.cc
+++ b/chrome/browser/site_instance_unittest.cc
@@ -21,8 +21,10 @@ class TestBrowsingInstance : public BrowsingInstance {
  public:
   TestBrowsingInstance(Profile* profile, int* deleteCounter)
       : BrowsingInstance(profile),
-        deleteCounter_(deleteCounter),
-        use_process_per_site(false) {}
+        use_process_per_site(false),
+        deleteCounter_(deleteCounter) {
+  }
+
   ~TestBrowsingInstance() {
     (*deleteCounter_)++;
   }
@@ -86,7 +88,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
 
   // Add a second reference
   NavigationEntry* e2 = new NavigationEntry(TAB_CONTENTS_WEB, instance, 0, url,
-                                            GURL(), std::wstring(), 
+                                            GURL(), std::wstring(),
                                             PageTransition::LINK);
 
   // Now delete both entries and be sure the SiteInstance goes away.
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index c56d960..fc7e253 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -266,6 +266,10 @@
 		82FA32330F3A4CC400271C5A /* web_contents_view.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9F20F1EC32700106F0D /* web_contents_view.cc */; };
 		82FA32760F3A537C00271C5A /* web_contents_view_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82FA32750F3A537C00271C5A /* web_contents_view_mac.mm */; };
 		82FA33460F3A7F6900271C5A /* render_widget_host_view_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82FA33450F3A7F6900271C5A /* render_widget_host_view_mac.mm */; };
+		844EA0870F3E0C3B00B0EF26 /* debugger_host_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844EA0750F3E0C1000B0EF26 /* debugger_host_impl.cpp */; };
+		844EA0880F3E0C4500B0EF26 /* debugger_io_socket.cc in Sources */ = {isa = PBXBuildFile; fileRef = 844EA0780F3E0C1000B0EF26 /* debugger_io_socket.cc */; };
+		844EA08D0F3E0C5000B0EF26 /* debugger_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = 844EA07A0F3E0C1000B0EF26 /* debugger_node.cc */; };
+		844EA08E0F3E0C5900B0EF26 /* debugger_wrapper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 844EA0820F3E0C1000B0EF26 /* debugger_wrapper.cc */; };
 		8570EB3F140C07ABF1957F12 /* url_pattern_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A9C335E39D39A7DE087850FC /* url_pattern_unittest.cc */; };
 		8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 778D7927798B7E3FAA498D3D /* url_fetcher.cc */; };
 		94542322A5E5A8F4FDDAB7F0 /* render_view_host_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = A76E42AD0F28EDB5009A7E88 /* render_view_host_manager.cc */; };
@@ -2300,6 +2304,24 @@
 		82FA32750F3A537C00271C5A /* web_contents_view_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = web_contents_view_mac.mm; path = tab_contents/web_contents_view_mac.mm; sourceTree = "<group>"; };
 		82FA33440F3A7F6900271C5A /* render_widget_host_view_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = render_widget_host_view_mac.h; path = renderer_host/render_widget_host_view_mac.h; sourceTree = "<group>"; };
 		82FA33450F3A7F6900271C5A /* render_widget_host_view_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = render_widget_host_view_mac.mm; path = renderer_host/render_widget_host_view_mac.mm; sourceTree = "<group>"; };
+		844EA0720F3E0BC900B0EF26 /* debugger_host.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_host.h; path = debugger/debugger_host.h; sourceTree = "<group>"; };
+		844EA0730F3E0BEA00B0EF26 /* debugger_contents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_contents.h; path = debugger/debugger_contents.h; sourceTree = "<group>"; };
+		844EA0740F3E0C1000B0EF26 /* debugger_contents.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_contents.cc; path = debugger/debugger_contents.cc; sourceTree = "<group>"; };
+		844EA0750F3E0C1000B0EF26 /* debugger_host_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_host_impl.cpp; path = debugger/debugger_host_impl.cpp; sourceTree = "<group>"; };
+		844EA0760F3E0C1000B0EF26 /* debugger_host_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_host_impl.h; path = debugger/debugger_host_impl.h; sourceTree = "<group>"; };
+		844EA0770F3E0C1000B0EF26 /* debugger_io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_io.h; path = debugger/debugger_io.h; sourceTree = "<group>"; };
+		844EA0780F3E0C1000B0EF26 /* debugger_io_socket.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_io_socket.cc; path = debugger/debugger_io_socket.cc; sourceTree = "<group>"; };
+		844EA0790F3E0C1000B0EF26 /* debugger_io_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_io_socket.h; path = debugger/debugger_io_socket.h; sourceTree = "<group>"; };
+		844EA07A0F3E0C1000B0EF26 /* debugger_node.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_node.cc; path = debugger/debugger_node.cc; sourceTree = "<group>"; };
+		844EA07B0F3E0C1000B0EF26 /* debugger_node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_node.h; path = debugger/debugger_node.h; sourceTree = "<group>"; };
+		844EA07C0F3E0C1000B0EF26 /* debugger_shell.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_shell.cc; path = debugger/debugger_shell.cc; sourceTree = "<group>"; };
+		844EA07D0F3E0C1000B0EF26 /* debugger_shell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_shell.h; path = debugger/debugger_shell.h; sourceTree = "<group>"; };
+		844EA07E0F3E0C1000B0EF26 /* debugger_view.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_view.cc; path = debugger/debugger_view.cc; sourceTree = "<group>"; };
+		844EA07F0F3E0C1000B0EF26 /* debugger_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_view.h; path = debugger/debugger_view.h; sourceTree = "<group>"; };
+		844EA0800F3E0C1000B0EF26 /* debugger_window.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_window.cc; path = debugger/debugger_window.cc; sourceTree = "<group>"; };
+		844EA0810F3E0C1000B0EF26 /* debugger_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_window.h; path = debugger/debugger_window.h; sourceTree = "<group>"; };
+		844EA0820F3E0C1000B0EF26 /* debugger_wrapper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugger_wrapper.cc; path = debugger/debugger_wrapper.cc; sourceTree = "<group>"; };
+		844EA0830F3E0C1000B0EF26 /* debugger_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugger_wrapper.h; path = debugger/debugger_wrapper.h; sourceTree = "<group>"; };
 		A54612D90EE9957000A8EE5D /* extensions_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extensions_service.cc; sourceTree = "<group>"; };
 		A54612DA0EE9957000A8EE5D /* extensions_service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extensions_service.h; sourceTree = "<group>"; };
 		A54612DB0EE9958600A8EE5D /* extensions_service_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extensions_service_unittest.cc; sourceTree = "<group>"; };
@@ -3001,6 +3023,7 @@
 				E48FB9600EC4EA270052B72B /* automation */,
 				E45075AE0F1505A6003BE099 /* bookmarks */,
 				E46C50D10F292E9B00B393B8 /* cocoa */,
+				844EA05A0F3E0B7400B0EF26 /* debugger */,
 				E43A77190F16618C00ABD5D1 /* dom_ui */,
 				4D7BF9C80E9D48B0009A6919 /* download */,
 				E4F3243F0EE5CE94002533CE /* extensions */,
@@ -3800,6 +3823,31 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		844EA05A0F3E0B7400B0EF26 /* debugger */ = {
+			isa = PBXGroup;
+			children = (
+				844EA0740F3E0C1000B0EF26 /* debugger_contents.cc */,
+				844EA0730F3E0BEA00B0EF26 /* debugger_contents.h */,
+				844EA0720F3E0BC900B0EF26 /* debugger_host.h */,
+				844EA0750F3E0C1000B0EF26 /* debugger_host_impl.cpp */,
+				844EA0760F3E0C1000B0EF26 /* debugger_host_impl.h */,
+				844EA0770F3E0C1000B0EF26 /* debugger_io.h */,
+				844EA0780F3E0C1000B0EF26 /* debugger_io_socket.cc */,
+				844EA0790F3E0C1000B0EF26 /* debugger_io_socket.h */,
+				844EA07A0F3E0C1000B0EF26 /* debugger_node.cc */,
+				844EA07B0F3E0C1000B0EF26 /* debugger_node.h */,
+				844EA07C0F3E0C1000B0EF26 /* debugger_shell.cc */,
+				844EA07D0F3E0C1000B0EF26 /* debugger_shell.h */,
+				844EA07E0F3E0C1000B0EF26 /* debugger_view.cc */,
+				844EA07F0F3E0C1000B0EF26 /* debugger_view.h */,
+				844EA0800F3E0C1000B0EF26 /* debugger_window.cc */,
+				844EA0810F3E0C1000B0EF26 /* debugger_window.h */,
+				844EA0820F3E0C1000B0EF26 /* debugger_wrapper.cc */,
+				844EA0830F3E0C1000B0EF26 /* debugger_wrapper.h */,
+			);
+			name = debugger;
+			sourceTree = "<group>";
+		};
 		B555B20F0F21503700F751B9 /* metrics */ = {
 			isa = PBXGroup;
 			children = (
@@ -5208,6 +5256,10 @@
 				82FA32760F3A537C00271C5A /* web_contents_view_mac.mm in Sources */,
 				E48B6C3C0F27844F002E47EC /* web_data_service.cc in Sources */,
 				E45076200F150E0C003BE099 /* web_database.cc in Sources */,
+				844EA0870F3E0C3B00B0EF26 /* debugger_host_impl.cpp in Sources */,
+				844EA0880F3E0C4500B0EF26 /* debugger_io_socket.cc in Sources */,
+				844EA08D0F3E0C5000B0EF26 /* debugger_node.cc in Sources */,
+				844EA08E0F3E0C5900B0EF26 /* debugger_wrapper.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index bdee164..1a10419 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -12,9 +12,11 @@
 #include "base/singleton.h"
 #include "base/task.h"
 #include "build/build_config.h"
+#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/cache_manager_host.h"
+#include "chrome/browser/debugger/debugger_shell.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/profile_manager.h"
@@ -40,6 +42,26 @@ size_t SessionRestore::num_tabs_to_load_ = 0;
 
 //--------------------------------------------------------------------------
 
+// static
+size_t AutocompleteProvider::max_matches_;
+
+// static
+size_t AutocompleteResult::max_matches_;
+
+//static
+std::string AutocompleteInput::TypeToString(AutocompleteInput::Type type) {
+  NOTIMPLEMENTED();
+  return "";
+}
+
+//static
+std::string AutocompleteMatch::TypeToString(AutocompleteMatch::Type type) {
+  NOTIMPLEMENTED();
+  return "";
+}
+
+//--------------------------------------------------------------------------
+
 UserDataManager* UserDataManager::instance_ = NULL;
 
 UserDataManager* UserDataManager::Create() {
@@ -169,7 +191,7 @@ TabContents* TabContents::CreateWithType(TabContentsType type,
                                          Profile* profile,
                                          SiteInstance* instance) {
   TabContents* contents;
-  
+
   switch (type) {
     case TAB_CONTENTS_WEB:
       contents = new WebContents(profile, instance, NULL, MSG_ROUTING_NONE,
@@ -179,10 +201,10 @@ TabContents* TabContents::CreateWithType(TabContentsType type,
       NOTREACHED() << "Don't know how to create tab contents of type " << type;
       contents = NULL;
   }
-  
+
   if (contents)
     contents->CreateView();
-  
+
   return contents;
 }
 
@@ -366,3 +388,17 @@ bool ClipboardIsFormatAvailable(Clipboard::FormatType format) {
 
 }  // webkit_glue
 
+#ifndef CHROME_DEBUGGER_DISABLED
+DebuggerShell::DebuggerShell(DebuggerInputOutput *io) { }
+DebuggerShell::~DebuggerShell() { }
+void DebuggerShell::Start() { NOTIMPLEMENTED(); }
+void DebuggerShell::Debug(TabContents* tab) { NOTIMPLEMENTED(); }
+void DebuggerShell::DebugMessage(const std::wstring& msg) { NOTIMPLEMENTED(); }
+void DebuggerShell::OnDebugAttach() { NOTIMPLEMENTED(); }
+void DebuggerShell::OnDebugDisconnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::DidConnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::DidDisconnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::ProcessCommand(const std::wstring& data) {
+  NOTIMPLEMENTED();
+}
+#endif  // !CHROME_DEBUGGER_DISABLED
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index b6a8e21..43b1111 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -306,14 +306,14 @@ class CancelableTask;
 class ViewMsg_Print_Params;
 
 namespace printing {
-  
+
 class PrintingContext {
  public:
   enum Result { OK, CANCEL, FAILED };
 };
-  
+
 class PrintSettings {
- public:    
+ public:
   void RenderParams(ViewMsg_Print_Params* params) const { NOTIMPLEMENTED(); }
   int dpi() const { NOTIMPLEMENTED(); return 92; }
 };
@@ -479,14 +479,6 @@ class IconManager {
 
 struct ViewHostMsg_DidPrintPage_Params;
 
-class DebuggerWrapper : public base::RefCountedThreadSafe<DebuggerWrapper> {
- public:
-  explicit DebuggerWrapper(int port) {}
-  void DebugMessage(const std::wstring&) {}
-  void OnDebugAttach() {}
-  void OnDebugDisconnect() {}
-};
-
 namespace views {
 
 class AcceleratorHandler {
@@ -859,7 +851,7 @@ class SpellChecker : public base::RefCountedThreadSafe<SpellChecker> {
                const Language& language,
                URLRequestContext* request_context,
                const std::wstring& custom_dictionary_file_name) {}
-  
+
   bool SpellCheckWord(const wchar_t* in_word,
                      int in_word_len,
                      int* misspelling_start,
@@ -877,16 +869,6 @@ class WebAppLauncher {
   }
 };
 
-class AutocompleteResult {
- public:
-  static void set_max_matches(int) { NOTIMPLEMENTED(); }
-};
-
-class AutocompleteProvider {
- public:
-  static void set_max_matches(int) { NOTIMPLEMENTED(); }
-};
-
 class URLFixerUpper {
  public:
   static std::wstring FixupRelativeFile(const std::wstring& base_dir,
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index eaa1afa..814cea8 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -37,6 +37,7 @@ env.Prepend(
     LIBS = [
         'browser',
         'common',
+        'debugger',
         'plugin',
         'renderer',
         'sqlite',
@@ -67,7 +68,6 @@ if env.Bit('windows'):
           # TODO(port):  to be ported to Mac and Linux, or else
           # moved to the Windows-specific list below.
           'browser_views',
-          'debugger',
           'jscre',
           'test_chrome_plugin',
           'views',
@@ -255,6 +255,7 @@ input_files = ChromeFileList([
     '$CHROME_DIR/renderer/render_widget_unittest.cc',
     '$CHROME_DIR/renderer/render_process_unittest.cc',
     '$CHROME_DIR/renderer/render_thread_unittest.cc',
+    '$CHROME_DIR/renderer/renderer_main_unittest.cc',
 
     # test_infrastructure
     '$CHROME_DIR/renderer/mock_render_process.h',
@@ -381,7 +382,6 @@ if not env.Bit('windows'):
       '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
       '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
       '$CHROME_DIR/browser/browser_commands_unittest.cc',
-      '$CHROME_DIR/browser/command_updater_unittest.cc',
       '$CHROME_DIR/browser/download/download_manager_unittest.cc',
       '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
       '$CHROME_DIR/browser/download/save_package_unittest.cc',
@@ -394,7 +394,6 @@ if not env.Bit('windows'):
       '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
       '$CHROME_DIR/browser/importer/importer_unittest.cc',
       '$CHROME_DIR/browser/login_prompt_unittest.cc',
-      '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
       '$CHROME_DIR/browser/renderer_host/render_widget_host_unittests.cc',
       '$CHROME_DIR/browser/navigation_controller_unittest.cc',
       '$CHROME_DIR/browser/net/dns_master_unittest.cc',
@@ -409,9 +408,6 @@ if not env.Bit('windows'):
       '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
       '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
       '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
       '$CHROME_DIR/browser/sessions/session_service_unittest.cc',