Use the normal Google logo for managed users for --enable-instant-extended-api

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
@@ skipping 192 matching lines @@
 
 class FakeTheme : public ui::ThemeProvider {
  public:
   FakeTheme(NSColor* color) : color_(color) {}
   base::scoped_nsobject<NSColor> color_;
 
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE {
     return NULL;
   }
   virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); }
-  virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE {
-    return false;
+  virtual int GetDisplayProperty(int id) const OVERRIDE {
+    return -1;
   }
   virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; }
   virtual bool HasCustomImage(int id) const OVERRIDE { return false; }
   virtual base::RefCountedMemory* GetRawData(
       int id,
       ui::ScaleFactor scale_factor) const OVERRIDE {
     return NULL;
   }
   virtual NSImage* GetNSImageNamed(int id) const OVERRIDE {
     return nil;
@@ skipping 1849 matching lines @@
                              "2f3b ] 4b ");
   actual = BookmarkModelTestUtils::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
 
   // Verify that the other bookmark folder can't be deleted.
   BookmarkButton *otherButton = [bar_ otherBookmarksButton];
   EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
 }
 
 }  // namespace