summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_init.cc9
-rw-r--r--chrome/browser/browser_process_impl.cc2
-rw-r--r--chrome/browser/debugger/debugger.scons2
-rw-r--r--chrome/browser/debugger/debugger_node.cc4
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc6
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc47
-rw-r--r--chrome/browser/site_instance_unittest.cc8
7 files changed, 38 insertions, 40 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.
generated by cgit v1.1 at 2025-04-06 12:56:56 +0000