Tweaks to get views compiling with mojo

ui/views/layout/grid_layout.cc

Index: ui/views/layout/grid_layout.cc
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index e4bf19d47c800383769cffcd363df1086c25981f..a378169aed93d90a605715e40d18f5929358c707 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -428,10 +428,10 @@ void ColumnSet::AddColumn(GridLayout::Alignment h_align,
 
 void ColumnSet::AddViewState(ViewState* view_state) {
   // view_states are ordered by column_span (in ascending order).
-  std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(),
-                                                    view_states_.end(),
-                                                    view_state,
-                                                    CompareByColumnSpan);
+  std::vector<ViewState*>::iterator i = std::lower_bound(view_states_.begin(),
+                                                         view_states_.end(),
+                                                         view_state,
+                                                         CompareByColumnSpan);
   view_states_.insert(i, view_state);
 }
 
@@ -503,8 +503,8 @@ void ColumnSet::AccumulateMasterColumns() {
     Column* column = *i;
     Column* master_column = column->GetLastMasterColumn();
     if (master_column &&
-        find(master_columns_.begin(), master_columns_.end(),
-             master_column) == master_columns_.end()) {
+        std::find(master_columns_.begin(), master_columns_.end(),
+                  master_column) == master_columns_.end()) {
       master_columns_.push_back(master_column);
     }
     // At this point, GetLastMasterColumn may not == master_column
@@ -980,10 +980,10 @@ void GridLayout::AddViewState(ViewState* view_state) {
   next_column_ += view_state->col_span;
   current_row_col_set_->AddViewState(view_state);
   // view_states are ordered by row_span (in ascending order).
-  std::vector<ViewState*>::iterator i = lower_bound(view_states_.begin(),
-                                                    view_states_.end(),
-                                                    view_state,
-                                                    CompareByRowSpan);
+  std::vector<ViewState*>::iterator i = std::lower_bound(view_states_.begin(),
+                                                         view_states_.end(),
+                                                         view_state,
+                                                         CompareByRowSpan);
   view_states_.insert(i, view_state);
   SkipPaddingColumns();
 }