Fix crash in a few of the tests in content_browsertests on Linux. The problem was that DesktopActiv…

base/scoped_observer.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_SCOPED_OBSERVER_H_
 #define BASE_SCOPED_OBSERVER_H_
 
 #include <algorithm>
 #include <vector>
 
@@ skipping 11 matching lines @@
     for (size_t i = 0; i < sources_.size(); ++i)
       sources_[i]->RemoveObserver(observer_);
   }
 
   // Adds the object passed to the constructor as an observer on |source|.
   void Add(Source* source) {
     sources_.push_back(source);
     source->AddObserver(observer_);
   }
 
   // Removse the object passed to the constructor as an observer from |source|.

[jar (doing other things), 2012/10/05 16:00:31]

nit: typo: removse --> removes

[jam, 2012/10/05 16:02:46]

Done.

   void Remove(Source* source) {
     sources_.erase(std::find(sources_.begin(), sources_.end(), source));
     source->RemoveObserver(observer_);
   }
 
+  bool IsObserving(Source* source) const {
+    for (size_t i = 0; i < sources_.size(); ++i) {
+      if (sources_[i] == source)
+        return true;
+    }
+    return false;
+  }
+
  private:
   Observer* observer_;
 
   std::vector<Source*> sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedObserver);
 };
 
 #endif  // BASE_SCOPED_OBSERVER_H_