7 files changed, 29 insertions, 31 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 5a6a770..66f824e 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -16,7 +16,7 @@ AlternateNavURLFetcher::AlternateNavURLFetcher(
     const GURL& alternate_nav_url)
     : LinkInfoBarDelegate(NULL),
       alternate_nav_url_(alternate_nav_url),
-      controller_(NULL), 
+      controller_(NULL),
       state_(NOT_STARTED),
       navigated_to_entry_(false),
       infobar_contents_(NULL) {
@@ -44,7 +44,8 @@ void AlternateNavURLFetcher::Observe(NotificationType type,
       state_ = IN_PROGRESS;
       fetcher_.reset(new URLFetcher(GURL(alternate_nav_url_), URLFetcher::HEAD,
                                     this));
-      fetcher_->set_request_context(controller_->profile()->GetRequestContext());
+      fetcher_->set_request_context(
+          controller_->profile()->GetRequestContext());
       fetcher_->Start();
       break;
 
diff --git a/chrome/browser/autofill_manager.cc b/chrome/browser/autofill_manager.cc
index 6b44dd6..8025cbb 100644
--- a/chrome/browser/autofill_manager.cc
+++ b/chrome/browser/autofill_manager.cc
@@ -16,11 +16,11 @@ void AutofillManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kFormAutofillEnabled, true);
 }
 
-AutofillManager::AutofillManager(WebContents* web_contents) :
-    web_contents_(web_contents),
-    pending_query_handle_(0),
-    node_id_(0),
-    request_id_(0) {
+AutofillManager::AutofillManager(WebContents* web_contents)
+    : web_contents_(web_contents),
+      pending_query_handle_(0),
+      node_id_(0),
+      request_id_(0) {
   form_autofill_enabled_.Init(prefs::kFormAutofillEnabled,
       profile()->GetPrefs(), NULL);
 }
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index 3b90289..699e01a 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/app/chrome_dll_resource.h" 
+#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index b10e7ac..00b1c31 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -143,7 +143,7 @@ enum LaunchMode {
   LM_SHORTCUT_QUICKLAUNCH,    // Launched from the quick launch bar.
   LM_SHORTCUT_DESKTOP,        // Launched from a desktop shortcut.
   LM_SHORTCUT_STARTMENU,      // Launched from start menu.
-  LM_LINUX_MAC_BEOS           // Other OS buckets start here. 
+  LM_LINUX_MAC_BEOS           // Other OS buckets start here.
 };
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 4b77c71..e5c6972 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -71,12 +71,10 @@
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/profile_manager.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index 64acd36..a30016a 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -31,22 +31,22 @@ std::wstring WindowCaptionFromPageTitle(std::wstring page_title) {
 
 class BrowserTest : public UITest {
  protected:
-   HWND GetMainWindow() {
-     scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-     scoped_ptr<WindowProxy> window(browser->GetWindow());
-
-     HWND window_handle;
-     EXPECT_TRUE(window->GetHWND(&window_handle));
-     return window_handle;
-   }
-
-   std::wstring GetWindowTitle() {
-     HWND window_handle = GetMainWindow();
-     std::wstring result;
-     int length = ::GetWindowTextLength(window_handle) + 1;
-     ::GetWindowText(window_handle, WriteInto(&result, length), length);
-     return result;
-   }
+  HWND GetMainWindow() {
+    scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+    scoped_ptr<WindowProxy> window(browser->GetWindow());
+
+    HWND window_handle;
+    EXPECT_TRUE(window->GetHWND(&window_handle));
+    return window_handle;
+  }
+
+  std::wstring GetWindowTitle() {
+    HWND window_handle = GetMainWindow();
+    std::wstring result;
+    int length = ::GetWindowTextLength(window_handle) + 1;
+    ::GetWindowText(window_handle, WriteInto(&result, length), length);
+    return result;
+  }
 };
 
 class VisibleBrowserTest : public UITest {
@@ -196,7 +196,7 @@ TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
   int orig_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&orig_tab_count));
   int orig_process_count = GetBrowserProcessCount();
-  ASSERT_TRUE(orig_process_count >= 1);
+  ASSERT_GE(orig_process_count, 1);
 
   // Use JavaScript URL to "fork" a new tab, just like Gmail.  (Open tab to a
   // blank page, set its opener to null, and redirect it cross-site.)
@@ -236,7 +236,7 @@ TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
   int orig_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&orig_tab_count));
   int orig_process_count = GetBrowserProcessCount();
-  ASSERT_TRUE(orig_process_count >= 1);
+  ASSERT_GE(orig_process_count, 1);
 
   // Use JavaScript URL to almost fork a new tab, but not quite.  (Leave the
   // opener non-null.)  Should not fork a process.
diff --git a/chrome/browser/cache_manager_host.cc b/chrome/browser/cache_manager_host.cc
index 4423184..241dbf1 100644
--- a/chrome/browser/cache_manager_host.cc
+++ b/chrome/browser/cache_manager_host.cc
@@ -41,7 +41,7 @@ int GetDefaultCacheSize() {
   return default_cache_size;
 }
 
-}
+}  // anonymous namespace
 
 // static
 void CacheManagerHost::RegisterPrefs(PrefService* prefs) {
@@ -373,4 +373,3 @@ void CacheManagerHost::FindInactiveRenderers() {
     ++iter;
   }
 }
-