Fix style issues in BookmarkModelVerifier class.

chrome/test/live_sync/bookmark_model_verifier.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(BROWSER_SYNC)
 
 #include "chrome/test/live_sync/bookmark_model_verifier.h"
 
 #include <vector>
 #include <stack>
@@ skipping 64 matching lines @@
   ASSERT_FALSE(a_iterator.has_next());
 }
 
 void BookmarkModelVerifier::VerifyNoDuplicates(BookmarkModel* model) {
   TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   // Pre-order traversal of model tree, looking for duplicate node at
   // each step.
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
     std::vector<const BookmarkNode*> nodes;
-    if (node->type() != BookmarkNode::URL) { continue; }
+    if (node->type() != BookmarkNode::URL)
+      continue;
     // Get nodes with same URL.
-    model->GetNodesByURL(node->GetURL(),&nodes);
-    EXPECT_TRUE(nodes.size()>=1);
-    for(std::vector<const BookmarkNode*>::const_iterator i=nodes.begin(), e=nodes.end(); i!=e; i++) {
+    model->GetNodesByURL(node->GetURL(), &nodes);
+    EXPECT_TRUE(nodes.size() >= 1);
+    for (std::vector<const BookmarkNode*>::const_iterator i = nodes.begin(),
+         e = nodes.end(); i != e; i++) {
       // Skip if it's same node.
       int64 id = node->id();
-      if ( id == (*i)->id()) { continue; }
-      else {
+      if (id == (*i)->id()) {
+        continue;
+      } else {
         // Make sure title are not same.
-        EXPECT_NE(node->GetTitle(),(*i)->GetTitle());
+        EXPECT_NE(node->GetTitle(), (*i)->GetTitle());
       }
     }
-  } // end of while
+  }  // end of while
 }
 
 void BookmarkModelVerifier::FindNodeInVerifier(BookmarkModel* foreign_model,
                                                const BookmarkNode* foreign_node,
                                                const BookmarkNode** result) {
   // Climb the tree.
   std::stack<int> path;
   const BookmarkNode* walker = foreign_node;
   while (walker != foreign_model->root_node()) {
     path.push(walker->GetParent()->IndexOfChild(walker));
@@ skipping 14 matching lines @@
   ExpectBookmarkInfoMatch(foreign_node, walker);
   *result = walker;
 }
 
 const BookmarkNode* BookmarkModelVerifier::AddGroup(BookmarkModel* model,
     const BookmarkNode* parent, int index, const string16& title) {
   const BookmarkNode* v_parent = NULL;
   FindNodeInVerifier(model, parent, &v_parent);
   const BookmarkNode* result = model->AddGroup(parent, index, title);
   EXPECT_TRUE(result);
-  if (!result) return NULL;
+  if (!result)
+    return NULL;
   const BookmarkNode* v_node = verifier_->AddGroup(v_parent, index, title);
   EXPECT_TRUE(v_node);
-  if (!v_node) return NULL;
+  if (!v_node)
+    return NULL;
   ExpectBookmarkInfoMatch(v_node, result);
   return result;
 }
 
 const BookmarkNode* BookmarkModelVerifier::AddNonEmptyGroup(
     BookmarkModel* model, const BookmarkNode* parent, int index,
     const string16& title, int children_count) {
   const BookmarkNode* bm_folder = AddGroup(model, parent, index, title);
   EXPECT_TRUE(bm_folder);
-  if (!bm_folder) return NULL;
+  if (!bm_folder)
+    return NULL;
   for (int child_index = 0; child_index < children_count; child_index++) {
     int random_int = base::RandInt(1, 100);
     // To create randomness in order, 60% of time add bookmarks
     if (random_int > 40) {
       string16 child_bm_title(bm_folder->GetTitle());
       child_bm_title.append(L"-ChildBM");
       string16 url(L"http://www.nofaviconurl");
       string16 index_str = IntToString16(child_index);
       child_bm_title.append(index_str);
       url.append(index_str);
@@ skipping 13 matching lines @@
   return bm_folder;
 }
 
 const BookmarkNode* BookmarkModelVerifier::AddURL(BookmarkModel* model,
     const BookmarkNode* parent, int index, const string16& title,
     const GURL& url) {
   const BookmarkNode* v_parent = NULL;
   FindNodeInVerifier(model, parent, &v_parent);
   const BookmarkNode* result = model->AddURL(parent, index, title, url);
   EXPECT_TRUE(result);
-  if (!result) return NULL;
+  if (!result)
+    return NULL;
   const BookmarkNode* v_node = verifier_->AddURL(v_parent, index, title, url);
   EXPECT_TRUE(v_node);
-  if (!v_node) return NULL;
+  if (!v_node)
+    return NULL;
   ExpectBookmarkInfoMatch(v_node, result);
   return result;
 }
 
 void BookmarkModelVerifier::SetTitle(BookmarkModel* model,
                                      const BookmarkNode* node,
                                      const string16& title) {
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
   model->SetTitle(node, title);
@@ skipping 24 matching lines @@
                                          const BookmarkNode* parent) {
   const BookmarkNode* v_parent = NULL;
   FindNodeInVerifier(model, parent, &v_parent);
   model->SortChildren(parent);
   verifier_->SortChildren(v_parent);
 }
 
 void BookmarkModelVerifier::ReverseChildOrder(BookmarkModel* model,
                                          const BookmarkNode* parent) {
   int child_count = parent->GetChildCount();
-  if (child_count <= 0) return;
-  for (int index = 0; index < child_count; index++) {
+  if (child_count <= 0)
+    return;
+  for (int index = 0; index < child_count; index++)
     Move(model, parent->GetChild(index), parent, child_count-index);
-  }
 }
 
 const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model,
                                    const BookmarkNode* node,
                                    const GURL& new_url) {
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
   const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange(
       model, node->GetParent(), BookmarkEditor::EditDetails(node),
       node->GetTitle(), new_url, NULL);
   bookmark_utils::ApplyEditsWithNoGroupChange(verifier_, v_node->GetParent(),
       BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url, NULL);
   return result;
 }
 
 #endif  // defined(BROWSER_SYNC)