Cleaning up lines longer than 80 chars under src/chrome/browser.

Command:
awk '{if ( length($0) > 80 ) { print FILENAME, FNR, $0  } }' *.cc *.h

# recursive
find . -type f \( -name '*.cc' -o -name '*.h' \) -exec awk '{if ( length($0) >
80 ) { print FILENAME, FNR, $0 } }' {} \;

Patch by Pierre-Antoine LaFayette <pierre.lafayette@gmail.com>

BUG=None
TEST=None

Code review URL: http://codereview.chromium.org/164566
Review URL: http://codereview.chromium.org/171066

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

31 files changed, 124 insertions, 68 deletions

diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index deaaf56..abc0279 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -167,7 +167,8 @@ void SearchProviderTest::TearDown() {
   provider_ = NULL;
 }
 
-AutocompleteMatch SearchProviderTest::FindMatchWithDestination(const GURL& url) {
+AutocompleteMatch SearchProviderTest::FindMatchWithDestination(
+    const GURL& url) {
   for (ACMatches::const_iterator i = provider_->matches().begin();
        i != provider_->matches().end(); ++i) {
     if (i->destination_url == url)
diff --git a/chrome/browser/autofill_manager.cc b/chrome/browser/autofill_manager.cc
index 08b631e..99b55bde 100644
--- a/chrome/browser/autofill_manager.cc
+++ b/chrome/browser/autofill_manager.cc
@@ -50,7 +50,8 @@ Profile* AutofillManager::profile() {
   return tab_contents_->profile();
 }
 
-void AutofillManager::AutofillFormSubmitted(const webkit_glue::AutofillForm& form) {
+void AutofillManager::AutofillFormSubmitted(
+    const webkit_glue::AutofillForm& form) {
   StoreFormEntriesInWebDatabase(form);
 }
 
diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/back_forward_menu_model_unittest.cc
index 1cc6823..f967f39 100644
--- a/chrome/browser/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/back_forward_menu_model_unittest.cc
@@ -224,7 +224,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
 
   // Seed the controller with 32 URLs.
   int i = 0;
-  LoadURLAndUpdateState("http://www.a.com/1", "A1"); // 0
+  LoadURLAndUpdateState("http://www.a.com/1", "A1");
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.a.com/2", "A2");
   ValidateModel(back_model.get(), i++, 0);
@@ -234,7 +234,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.b.com/2", "B2");
   ValidateModel(back_model.get(), i++, 0);
-  LoadURLAndUpdateState("http://www.b.com/3", "B3"); // 5
+  // i = 5
+  LoadURLAndUpdateState("http://www.b.com/3", "B3");
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.c.com/1", "C1");
   ValidateModel(back_model.get(), i++, 0);
@@ -244,7 +245,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.d.com/1", "D1");
   ValidateModel(back_model.get(), i++, 0);
-  LoadURLAndUpdateState("http://www.d.com/2", "D2"); // 10
+  // i = 10
+  LoadURLAndUpdateState("http://www.d.com/2", "D2");
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.d.com/3", "D3");
   ValidateModel(back_model.get(), i++, 0);
@@ -254,7 +256,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.e.com/3", "E3");
   ValidateModel(back_model.get(), i++, 0);
-  LoadURLAndUpdateState("http://www.f.com/1", "F1"); // 15
+  // i = 15
+  LoadURLAndUpdateState("http://www.f.com/1", "F1");
   ValidateModel(back_model.get(), i++, 1);
   LoadURLAndUpdateState("http://www.f.com/2", "F2");
   ValidateModel(back_model.get(), i++, 1);
@@ -264,7 +267,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 2);
   LoadURLAndUpdateState("http://www.g.com/2", "G2");
   ValidateModel(back_model.get(), i++, 2);
-  LoadURLAndUpdateState("http://www.g.com/3", "G3"); // 20
+  // i = 20
+  LoadURLAndUpdateState("http://www.g.com/3", "G3");
   ValidateModel(back_model.get(), i++, 2);
   LoadURLAndUpdateState("http://www.h.com/1", "H1");
   ValidateModel(back_model.get(), i++, 3);
@@ -274,7 +278,8 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 3);
   LoadURLAndUpdateState("http://www.i.com/1", "I1");
   ValidateModel(back_model.get(), i++, 4);
-  LoadURLAndUpdateState("http://www.i.com/2", "I2"); // 25
+  // i = 25
+  LoadURLAndUpdateState("http://www.i.com/2", "I2");
   ValidateModel(back_model.get(), i++, 4);
   LoadURLAndUpdateState("http://www.i.com/3", "I3");
   ValidateModel(back_model.get(), i++, 4);
@@ -284,22 +289,30 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   ValidateModel(back_model.get(), i++, 5);
   LoadURLAndUpdateState("http://www.j.com/3", "J3");
   ValidateModel(back_model.get(), i++, 5);
-  LoadURLAndUpdateState("http://www.k.com/1", "K1"); // 30
+  // i = 30
+  LoadURLAndUpdateState("http://www.k.com/1", "K1");
   ValidateModel(back_model.get(), i++, 6);
   LoadURLAndUpdateState("http://www.k.com/2", "K2");
   ValidateModel(back_model.get(), i++, 6);
-  LoadURLAndUpdateState("http://www.k.com/3", "K3"); // 32
+  // i = 32
+  LoadURLAndUpdateState("http://www.k.com/3", "K3");
   ValidateModel(back_model.get(), i++, 6);
 
+  // A chapter stop is defined as the last page the user
+  // browsed to within the same domain.
+
   // Check to see if the chapter stops have the right labels.
   int index = BackForwardMenuModel::kMaxHistoryItems + 1;
-  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index++));  // separator.
+  // Empty string indicates item is a separator.
+  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("F3"), back_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("E3"), back_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("D3"), back_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("C3"), back_model->GetItemLabel(index++));
-  EXPECT_EQ(ASCIIToUTF16("B3"), back_model->GetItemLabel(index));  // max 5 chapter stops.
-  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index + 1));  // separator.
+  // The menu should only show a maximum of 5 chapter stops.
+  EXPECT_EQ(ASCIIToUTF16("B3"), back_model->GetItemLabel(index));
+  // Empty string indicates item is a separator.
+  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index + 1));
   EXPECT_EQ(back_model->GetShowFullHistoryLabel(),
             back_model->GetItemLabel(index + 2));
 
@@ -316,8 +329,10 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
   GoBack();
   EXPECT_EQ(ASCIIToUTF16("A3"), back_model->GetItemLabel(index));
   GoBack();
-  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index));  // It is now a separator.
-  NavigateToOffset(6);  // Undo our position change.
+  // It is now a separator.
+  EXPECT_EQ(ASCIIToUTF16(""), back_model->GetItemLabel(index));
+  // Undo our position change.
+  NavigateToOffset(6);
 
   // Go back enough to make sure no chapter stops should appear.
   NavigateToOffset(-BackForwardMenuModel::kMaxHistoryItems);
@@ -337,14 +352,16 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
 
   // Check to see if the chapter stops have the right labels.
   index = BackForwardMenuModel::kMaxHistoryItems + 1;
-  EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetItemLabel(index++));    // separator.
+  // Empty string indicates item is a separator.
+  EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("E3"), forward_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("F3"), forward_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("G3"), forward_model->GetItemLabel(index++));
   EXPECT_EQ(ASCIIToUTF16("H3"), forward_model->GetItemLabel(index++));
-  // max 5 chapter stops.
+  // The menu should only show a maximum of 5 chapter stops.
   EXPECT_EQ(ASCIIToUTF16("I3"), forward_model->GetItemLabel(index));
-  EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetItemLabel(index + 1));  // separator.
+  // Empty string indicates item is a separator.
+  EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetItemLabel(index + 1));
   EXPECT_EQ(forward_model->GetShowFullHistoryLabel(),
       forward_model->GetItemLabel(index + 2));
 
@@ -382,14 +399,16 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) {
 
   // Bug found during review (two different sites, but first wasn't considered
   // a chapter-stop).
-  NavigateToIndex(0);  // Go to A1;
+  // Go to A1;
+  NavigateToIndex(0);
   LoadURLAndUpdateState("http://www.b.com/1", "B1");
   EXPECT_EQ(0, back_model->GetIndexOfNextChapterStop(1, false));
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(0, true));
 
   // Now see if it counts 'www.x.com' and 'mail.x.com' as same domain, which
   // it should.
-  NavigateToIndex(0);  // Go to A1.
+  // Go to A1.
+  NavigateToIndex(0);
   LoadURLAndUpdateState("http://mail.a.com/2", "A2-mai");
   LoadURLAndUpdateState("http://www.b.com/1", "B1");
   LoadURLAndUpdateState("http://mail.b.com/2", "B2-mai");
diff --git a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
index 39bc782..54ee29e 100644
--- a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
@@ -132,7 +132,8 @@ TEST_F(BookmarkTableModelTest, AddToFolder) {
   const BookmarkNode* other = bookmark_model()->other_node();
   SetModel(BookmarkTableModel::CreateBookmarkTableModelForFolder(
       bookmark_model(), other));
-  const BookmarkNode* new_node = bookmark_model()->AddURL(other, 0, L"new", url1_);
+  const BookmarkNode* new_node = bookmark_model()->AddURL(other, 0, L"new",
+                                                          url1_);
   // Should have gotten notification of the add.
   VerifyAndClearOberserverCounts(0, 0, 1, 0);
   ASSERT_EQ(4, model_->RowCount());
diff --git a/chrome/browser/child_process_security_policy.cc b/chrome/browser/child_process_security_policy.cc
index c1cb73e..7f009e9 100644
--- a/chrome/browser/child_process_security_policy.cc
+++ b/chrome/browser/child_process_security_policy.cc
@@ -133,7 +133,8 @@ void ChildProcessSecurityPolicy::Remove(int renderer_id) {
   security_state_.erase(renderer_id);
 }
 
-void ChildProcessSecurityPolicy::RegisterWebSafeScheme(const std::string& scheme) {
+void ChildProcessSecurityPolicy::RegisterWebSafeScheme(
+    const std::string& scheme) {
   AutoLock lock(lock_);
   DCHECK(web_safe_schemes_.count(scheme) == 0) << "Add schemes at most once.";
   DCHECK(pseudo_schemes_.count(scheme) == 0) << "Web-safe implies not psuedo.";
@@ -147,7 +148,8 @@ bool ChildProcessSecurityPolicy::IsWebSafeScheme(const std::string& scheme) {
   return (web_safe_schemes_.find(scheme) != web_safe_schemes_.end());
 }
 
-void ChildProcessSecurityPolicy::RegisterPseudoScheme(const std::string& scheme) {
+void ChildProcessSecurityPolicy::RegisterPseudoScheme(
+    const std::string& scheme) {
   AutoLock lock(lock_);
   DCHECK(pseudo_schemes_.count(scheme) == 0) << "Add schemes at most once.";
   DCHECK(web_safe_schemes_.count(scheme) == 0) <<
@@ -162,7 +164,8 @@ bool ChildProcessSecurityPolicy::IsPseudoScheme(const std::string& scheme) {
   return (pseudo_schemes_.find(scheme) != pseudo_schemes_.end());
 }
 
-void ChildProcessSecurityPolicy::GrantRequestURL(int renderer_id, const GURL& url) {
+void ChildProcessSecurityPolicy::GrantRequestURL(
+    int renderer_id, const GURL& url) {
 
   if (!url.is_valid())
     return;  // Can't grant the capability to request invalid URLs.
@@ -249,7 +252,8 @@ void ChildProcessSecurityPolicy::GrantExtensionBindings(int renderer_id) {
   state->second->GrantBindings(BindingsPolicy::EXTENSION);
 }
 
-bool ChildProcessSecurityPolicy::CanRequestURL(int renderer_id, const GURL& url) {
+bool ChildProcessSecurityPolicy::CanRequestURL(
+    int renderer_id, const GURL& url) {
   if (!url.is_valid())
     return false;  // Can't request invalid URLs.
 
diff --git a/chrome/browser/child_process_security_policy.h b/chrome/browser/child_process_security_policy.h
index bc905bb..402cd1b 100644
--- a/chrome/browser/child_process_security_policy.h
+++ b/chrome/browser/child_process_security_policy.h
@@ -30,9 +30,9 @@ class ChildProcessSecurityPolicy {
   // private.
   ~ChildProcessSecurityPolicy();
 
-  // There is one global ChildProcessSecurityPolicy object for the entire browser
-  // processes.  The object returned by this method may be accessed on any
-  // thread.
+  // There is one global ChildProcessSecurityPolicy object for the entire
+  // browser process.  The object returned by this method may be accessed on
+  // any thread.
   static ChildProcessSecurityPolicy* GetInstance();
 
   // Web-safe schemes can be requested by any renderer.  Once a web-safe scheme
diff --git a/chrome/browser/child_process_security_policy_unittest.cc b/chrome/browser/child_process_security_policy_unittest.cc
index 88f1e33..1cdccc9 100644
--- a/chrome/browser/child_process_security_policy_unittest.cc
+++ b/chrome/browser/child_process_security_policy_unittest.cc
@@ -258,8 +258,8 @@ TEST_F(ChildProcessSecurityPolicyTest, RemoveRace) {
   p->Remove(kRendererID);
 
   // Renderers are added and removed on the UI thread, but the policy can be
-  // queried on the IO thread.  The ChildProcessSecurityPolicy needs to be prepared
-  // to answer policy questions about renderers who no longer exist.
+  // queried on the IO thread.  The ChildProcessSecurityPolicy needs to be
+  // prepared to answer policy questions about renderers who no longer exist.
 
   // In this case, we default to secure behavior.
   EXPECT_FALSE(p->CanRequestURL(kRendererID, url));
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 2b77640..3c521484 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -75,7 +75,8 @@ class DevToolsSanityTest : public InProcessBrowserTest {
           ui_test_utils::ExecuteJavaScriptAndExtractString(
               client_contents_->render_view_host(),
               L"",
-              UTF8ToWide(StringPrintf("uiTests.runTest('%s')", test_name.c_str())),
+              UTF8ToWide(StringPrintf("uiTests.runTest('%s')",
+                                      test_name.c_str())),
               &result));
       EXPECT_EQ("[OK]", result);
     } else {
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
index bacb32d..b5dd5af 100644
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
@@ -213,7 +213,8 @@ gboolean BookmarkMenuController::OnButtonPressed(
     // If the cursor is outside our bounds, pass this event up to the parent.
     if (!gtk_util::WidgetContainsCursor(sender)) {
       if (menu_shell->parent_menu_shell) {
-        return OnButtonPressed(menu_shell->parent_menu_shell, event, controller);
+        return OnButtonPressed(menu_shell->parent_menu_shell, event,
+                               controller);
       } else {
         // We are the top level menu; we can propagate no further.
         return FALSE;
diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc
index 0fc3480..35cd4f2 100644
--- a/chrome/browser/gtk/gtk_chrome_button.cc
+++ b/chrome/browser/gtk/gtk_chrome_button.cc
@@ -47,7 +47,8 @@ static void gtk_chrome_button_class_init(GtkChromeButtonClass* button_class) {
       "widget \"*chrome-button\" style \"chrome-button\"");
 
   GObjectClass* gobject_class = G_OBJECT_CLASS(button_class);
-  GtkWidgetClass* widget_class = reinterpret_cast<GtkWidgetClass*>(button_class);
+  GtkWidgetClass* widget_class = reinterpret_cast<GtkWidgetClass*>(
+      button_class);
   widget_class->expose_event = gtk_chrome_button_expose;
 
   g_nine_box_prelight = new NineBox(
diff --git a/chrome/browser/gtk/gtk_chrome_link_button.cc b/chrome/browser/gtk/gtk_chrome_link_button.cc
index d4c7fb2..fde471a 100644
--- a/chrome/browser/gtk/gtk_chrome_link_button.cc
+++ b/chrome/browser/gtk/gtk_chrome_link_button.cc
@@ -101,7 +101,8 @@ static gboolean gtk_chrome_link_button_expose(GtkWidget* widget,
     button->is_blue = FALSE;
   } else if (GTK_WIDGET_STATE(widget) != GTK_STATE_ACTIVE && !button->is_blue) {
     gtk_label_set_markup(GTK_LABEL(label),
-        button->using_native_theme ? button->native_markup : button->blue_markup);
+        button->using_native_theme ? button->native_markup :
+                                     button->blue_markup);
     button->is_blue = TRUE;
   }
 
diff --git a/chrome/browser/gtk/tab_contents_drag_source.cc b/chrome/browser/gtk/tab_contents_drag_source.cc
index 639795b..2cfd0c1d 100644
--- a/chrome/browser/gtk/tab_contents_drag_source.cc
+++ b/chrome/browser/gtk/tab_contents_drag_source.cc
@@ -143,7 +143,8 @@ void TabContentsDragSource::OnDragDataGet(
       // |html_base_url|.
       std::string utf8_text = UTF16ToUTF8(drop_data_->text_html);
       gtk_selection_data_set(selection_data,
-                             GtkDndUtil::GetAtomForTarget(GtkDndUtil::TEXT_HTML),
+                             GtkDndUtil::GetAtomForTarget(
+                                 GtkDndUtil::TEXT_HTML),
                              bits_per_byte,
                              reinterpret_cast<const guchar*>(utf8_text.c_str()),
                              utf8_text.length());
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index c374f26..45302d2 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -566,8 +566,8 @@ void ImporterHost::StartImportSettings(const ProfileInfo& profile_info,
       BrowsingInstance* instance = new BrowsingInstance(writer_->GetProfile());
       SiteInstance* site = instance->GetSiteInstanceForURL(url);
       Browser* browser = BrowserList::GetLastActive();
-      browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, -1, false,
-                             site);
+      browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, -1,
+                             false, site);
 
       MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
         this, &ImporterHost::OnLockViewEnd, false));
diff --git a/chrome/browser/importer/nss_decryptor_linux.cc b/chrome/browser/importer/nss_decryptor_linux.cc
index b30bfe8..a8e8d44 100644
--- a/chrome/browser/importer/nss_decryptor_linux.cc
+++ b/chrome/browser/importer/nss_decryptor_linux.cc
@@ -109,7 +109,10 @@ unpadBlock(SECItem *data, int blockSize, SECItem *result)
   result->len = 0;
 
   /* Remove the padding from the end if the input data */
-  if (data->len == 0 || data->len % blockSize  != 0) { rv = SECFailure; goto loser; }
+  if (data->len == 0 || data->len % blockSize  != 0) {
+    rv = SECFailure;
+    goto loser;
+  }
 
   padLength = data->data[data->len-1];
   if (padLength > blockSize) { rv = SECFailure; goto loser; }
@@ -138,8 +141,8 @@ loser:
 
 /* decrypt a block */
 static SECStatus
-pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena, 
-            CK_MECHANISM_TYPE type, PK11SymKey *key, 
+pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
+            CK_MECHANISM_TYPE type, PK11SymKey *key,
             SECItem *params, SECItem *in, SECItem *result)
 {
   PK11Context *ctx = 0;
@@ -156,7 +159,7 @@ pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
   paddedResult.data = static_cast<unsigned char*>(
       PORT_ArenaAlloc(arena, paddedResult.len));
 
-  rv = PK11_CipherOp(ctx, paddedResult.data, 
+  rv = PK11_CipherOp(ctx, paddedResult.data,
                         (int*)&paddedResult.len, paddedResult.len,
                         in->data, in->len);
   if (rv != SECSuccess) goto loser;
@@ -197,10 +200,10 @@ SECStatus NSSDecryptor::PK11SDR_DecryptWithSlot(
   /* Use triple-DES (Should look up the algorithm) */
   type = CKM_DES3_CBC;
   key = PK11_FindFixedKey(slot, type, &sdrResult.keyid, cx);
-  if (!key) { 
-    rv = SECFailure;  
+  if (!key) {
+    rv = SECFailure;
   } else {
-    rv = pk11Decrypt(slot, arena, type, key, params, 
+    rv = pk11Decrypt(slot, arena, type, key, params,
                      &sdrResult.data, result);
   }
 
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index c3e1b14..c783451 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -186,7 +186,8 @@ FilePath PluginService::GetPluginPath(const GURL& url,
   return FilePath();
 }
 
-void PluginService::OnWaitableEventSignaled(base::WaitableEvent* waitable_event) {
+void PluginService::OnWaitableEventSignaled(
+    base::WaitableEvent* waitable_event) {
 #if defined(OS_WIN)
   if (waitable_event == hkcu_event_.get()) {
     hkcu_key_.StartWatching();
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 8acc403..8db507e 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -454,7 +454,8 @@ void RenderViewHost::DragTargetDragEnter(
     const gfx::Point& client_pt,
     const gfx::Point& screen_pt) {
   // Grant the renderer the ability to load the drop_data.
-  ChildProcessSecurityPolicy* policy = ChildProcessSecurityPolicy::GetInstance();
+  ChildProcessSecurityPolicy* policy =
+      ChildProcessSecurityPolicy::GetInstance();
   policy->GrantRequestURL(process()->pid(), drop_data.url);
   for (std::vector<string16>::const_iterator iter(drop_data.filenames.begin());
        iter != drop_data.filenames.end(); ++iter) {
@@ -927,7 +928,8 @@ void RenderViewHost::OnMsgNavigate(const IPC::Message& msg) {
     return;
 
   const int renderer_id = process()->pid();
-  ChildProcessSecurityPolicy* policy = ChildProcessSecurityPolicy::GetInstance();
+  ChildProcessSecurityPolicy* policy =
+      ChildProcessSecurityPolicy::GetInstance();
   // Without this check, an evil renderer can trick the browser into creating
   // a navigation entry for a banned URL.  If the user clicks the back button
   // followed by the forward button (or clicks reload, or round-trips through
@@ -1442,7 +1444,8 @@ void RenderViewHost::UpdateBackForwardListCount() {
   RenderViewHostDelegate::BrowserIntegration* integration_delegate =
       delegate_->GetBrowserIntegrationDelegate();
   if (integration_delegate) {
-    integration_delegate->GetHistoryListCount(&back_list_count, &forward_list_count);
+    integration_delegate->GetHistoryListCount(&back_list_count,
+                                              &forward_list_count);
     Send(new ViewMsg_UpdateBackForwardListCount(
          routing_id(), back_list_count, forward_list_count));
   }
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index 91ea97b..33b48d3 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -238,7 +238,8 @@ void RenderWidgetHelper::OnCreateWindowOnUI(
     host->CreateNewWindow(route_id, modal_dialog_event);
 
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-      NewRunnableMethod(this, &RenderWidgetHelper::OnCreateWindowOnIO, route_id));
+      NewRunnableMethod(this, &RenderWidgetHelper::OnCreateWindowOnIO,
+                        route_id));
 }
 
 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) {
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index 606dc3c..2c4d07c 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -298,7 +298,8 @@ TEST_F(TemplateURLModelTest, ClearBrowsingData_Keywords) {
                      now + one_day);
   // Try the other three states.
   AddKeywordWithDate(L"key5", false, L"http://foo5", L"name5", false, now);
-  AddKeywordWithDate(L"key6", false, L"http://foo6", L"name6", false, month_ago);
+  AddKeywordWithDate(L"key6", false, L"http://foo6", L"name6", false,
+                     month_ago);
 
   // We just added a few items, validate them.
   EXPECT_EQ(6U, model_->GetTemplateURLs().size());
diff --git a/chrome/browser/tab_contents/navigation_controller_unittest.cc b/chrome/browser/tab_contents/navigation_controller_unittest.cc
index 8047216..3f3e203 100644
--- a/chrome/browser/tab_contents/navigation_controller_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_controller_unittest.cc
@@ -1412,7 +1412,8 @@ TEST_F(NavigationControllerHistoryTest, Basic) {
   TabNavigation nav1(0, url0, GURL(), string16(),
                      webkit_glue::CreateHistoryStateForURL(url0),
                      PageTransition::LINK);
-  session_helper_.AssertNavigationEquals(nav1, windows_[0]->tabs[0]->navigations[0]);
+  session_helper_.AssertNavigationEquals(nav1,
+                                         windows_[0]->tabs[0]->navigations[0]);
 }
 
 // Navigates to three urls, then goes back and make sure the history database
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 57795a4..bc2eaa8 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -1109,7 +1109,8 @@ TEST_F(TabStripModelTest, AddTabContents_NewTabAtEndOfStripInheritsGroup) {
 
   // Open a New Tab at the end of the strip (simulate Ctrl+T)
   TabContents* new_tab_contents = CreateTabContents();
-  strip.AddTabContents(new_tab_contents, -1, false, PageTransition::TYPED, true);
+  strip.AddTabContents(new_tab_contents, -1, false, PageTransition::TYPED,
+                       true);
 
   EXPECT_EQ(4, strip.GetIndexOfTabContents(new_tab_contents));
   EXPECT_EQ(4, strip.selected_index());
@@ -1139,8 +1140,8 @@ TEST_F(TabStripModelTest, AddTabContents_NewTabAtEndOfStripInheritsGroup) {
   // in New Tab". No opener relationship should be preserved between this Tab
   // and the one that was active when the gesture was performed.
   TabContents* page_f_contents = CreateTabContents();
-  strip.AddTabContents(page_f_contents, -1, false, PageTransition::AUTO_BOOKMARK,
-                       true);
+  strip.AddTabContents(page_f_contents, -1, false,
+                       PageTransition::AUTO_BOOKMARK, true);
 
   EXPECT_EQ(4, strip.GetIndexOfTabContents(page_f_contents));
   EXPECT_EQ(4, strip.selected_index());
@@ -1177,7 +1178,8 @@ TEST_F(TabStripModelTest, NavigationForgetsOpeners) {
 
   // Open page E in a different opener group from page A.
   TabContents* page_e_contents = CreateTabContents();
-  strip.AddTabContents(page_e_contents, -1, false, PageTransition::START_PAGE, false);
+  strip.AddTabContents(page_e_contents, -1, false,
+                       PageTransition::START_PAGE, false);
 
   // Tell the TabStripModel that we are navigating page D via a link click.
   strip.SelectTabContentsAt(3, true);
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index f712528..b66cc22 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -74,7 +74,8 @@ const std::string TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML =
 
 const std::string CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER =
     "<html><head><title>only_one_unload</title></head>"
-    "<body onload=\"window.open('data:text/html,<html><head><title>popup</title></head></body>')\" "
+    "<body onload=\"window.open('data:text/html,"
+    "<html><head><title>popup</title></head></body>')\" "
     "onbeforeunload='return;'"
     "</body></html>";
 
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 2bb6f5e..a34a310 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -692,7 +692,8 @@ void BookmarkManagerView::ShowMenu(
     return;
 
   if (config == BookmarkContextMenuController::BOOKMARK_MANAGER_TABLE ||
-      (config == BookmarkContextMenuController::BOOKMARK_MANAGER_ORGANIZE_MENU &&
+      (config ==
+          BookmarkContextMenuController::BOOKMARK_MANAGER_ORGANIZE_MENU &&
        table_view_->HasFocus())) {
     std::vector<const BookmarkNode*> nodes = GetSelectedTableNodes();
     const BookmarkNode* parent = GetSelectedFolder();
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index bae65b4..cb84d08 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -52,7 +52,8 @@ class ClearBrowsingDataView : public views::View,
   // Overridden from views::DialogDelegate:
   virtual std::wstring GetDialogButtonLabel(
       MessageBoxFlags::DialogButton button) const;
-  virtual bool IsDialogButtonEnabled(MessageBoxFlags::DialogButton button) const;
+  virtual bool IsDialogButtonEnabled(
+      MessageBoxFlags::DialogButton button) const;
   virtual bool CanResize() const;
   virtual bool CanMaximize() const;
   virtual bool IsAlwaysOnTop() const;
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 9df7dd4..2538038 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -51,7 +51,8 @@ int BrowserFrameGtk::GetMinimizeButtonOffset() const {
   return 0;
 }
 
-gfx::Rect BrowserFrameGtk::GetBoundsForTabStrip(TabStripWrapper* tabstrip) const {
+gfx::Rect BrowserFrameGtk::GetBoundsForTabStrip(
+    TabStripWrapper* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index 92aa255..d8484f4 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -84,7 +84,8 @@ int BrowserFrameWin::GetMinimizeButtonOffset() const {
   return minimize_button_corner.x;
 }
 
-gfx::Rect BrowserFrameWin::GetBoundsForTabStrip(TabStripWrapper* tabstrip) const {
+gfx::Rect BrowserFrameWin::GetBoundsForTabStrip(
+    TabStripWrapper* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
@@ -143,7 +144,8 @@ void BrowserFrameWin::OnExitSizeMove() {
       detached_drag_mode_ = false;
       if (drop_tabstrip_) {
         gfx::Point screen_point = views::Screen::GetCursorScreenPoint();
-        BrowserTabStrip* tabstrip = browser_view_->tabstrip()->AsBrowserTabStrip();
+        BrowserTabStrip* tabstrip =
+            browser_view_->tabstrip()->AsBrowserTabStrip();
         gfx::Rect tsb = tabstrip->GetDraggedTabScreenBounds(screen_point);
         drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
       } else {
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 1cf5f30..91b6d01 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -68,7 +68,8 @@ class GeneralPageView : public OptionsPageView,
  private:
   // ShellIntegration::DefaultBrowserObserver implementation:
   // Updates the UI state to reflect the current default browser state.
-  virtual void SetDefaultBrowserUIState(ShellIntegration::DefaultBrowserUIState state);
+  virtual void SetDefaultBrowserUIState(
+      ShellIntegration::DefaultBrowserUIState state);
 
   // Init all the dialog controls
   void InitStartupGroup();
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
index 56fd42a..29a6ef2 100644
--- a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
+++ b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
@@ -47,8 +47,8 @@ void NativeTabContentsContainerGtk::AttachContents(TabContents* contents) {
 void NativeTabContentsContainerGtk::DetachContents(TabContents* contents) {
   // TODO(port): figure out focus interception
 #if defined(OS_WIN)
-  // TODO(brettw) should this move to NativeViewHost::Detach which is called below?
-  // It needs cleanup regardless.
+  // TODO(brettw) should this move to NativeViewHost::Detach which is called
+  // below? It needs cleanup regardless.
   HWND container_hwnd = contents->GetNativeView();
 
   // Hide the contents before adjusting its parent to avoid a full desktop
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 539ece9..f15911b 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 
 #include <map>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
@@ -464,7 +465,8 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddAutofillFormElementsImpl(
-      GenericRequest<std::vector<webkit_glue::AutofillForm::Element> >* request);
+      GenericRequest<std::vector<webkit_glue::AutofillForm::Element> >*
+          request);
   void GetFormValuesForElementNameImpl(WebDataRequest* request,
       const std::wstring& name, const std::wstring& prefix, int limit);
   void RemoveFormElementsAddedBetweenImpl(
diff --git a/chrome/browser/window_sizer_linux.cc b/chrome/browser/window_sizer_linux.cc
index 109d983..1dea211 100644
--- a/chrome/browser/window_sizer_linux.cc
+++ b/chrome/browser/window_sizer_linux.cc
@@ -118,7 +118,8 @@ gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) {
     // Limit to not overflow the work area right and bottom edges.
     gfx::Point limit(
         std::min(x + kWindowTilePixels, monitor_bounds.right() - size.width()),
-        std::min(y + kWindowTilePixels, monitor_bounds.bottom() - size.height()));
+        std::min(y + kWindowTilePixels,
+                 monitor_bounds.bottom() - size.height()));
     // Adjust corner to now overflow the work area left and top edges, so
     // that if a popup does not fit the title-bar is remains visible.
     corner = gfx::Point(
diff --git a/chrome/browser/window_sizer_unittest.cc b/chrome/browser/window_sizer_unittest.cc
index 54af8a1..1c125eb 100644
--- a/chrome/browser/window_sizer_unittest.cc
+++ b/chrome/browser/window_sizer_unittest.cc
@@ -346,7 +346,9 @@ TEST(WindowSizerTest, LastWindowBoundsCase) {
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
-                        kWindowTilePixels * 2, 30 /* not 29 */, 30 /* not 29 */),
+                        kWindowTilePixels * 2,
+                        30 /* not 29 */,
+                        30 /* not 29 */),
               window_bounds);
   }
 
diff --git a/chrome/browser/worker_host/worker_service.h b/chrome/browser/worker_host/worker_service.h
index 704a7da..b7cb6e0 100644
--- a/chrome/browser/worker_host/worker_service.h
+++ b/chrome/browser/worker_host/worker_service.h
@@ -73,7 +73,8 @@ class WorkerService : public NotificationObserver {
 
   // Checks if we can create a worker process based on the process limit when
   // we're using a strategy of one process per core.
-  bool CanCreateWorkerProcess(const WorkerProcessHost::WorkerInstance& instance);
+  bool CanCreateWorkerProcess(
+      const WorkerProcessHost::WorkerInstance& instance);
 
   // NotificationObserver interface.
   void Observe(NotificationType type,