Merge r33241 to the 249 branch....

chrome/browser/cocoa/about_window_controller_unittest.mm

 // Copyright (c) 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
-#import "chrome/app/keystone_glue.h"
 #import "chrome/browser/cocoa/about_window_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/cocoa/keystone_glue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 void PostAutoupdateStatusNotification(AutoupdateStatus status,
                                              NSString* version) {
   NSNumber* statusNumber = [NSNumber numberWithInt:status];
   NSMutableDictionary* dictionary =
       [NSMutableDictionary dictionaryWithObjects:&statusNumber
@@ skipping 109 matching lines @@
                                   stringValue]]);
 #endif
 
   lastText = [[about_window_controller_ updateText] stringValue];
   PostAutoupdateStatusNotification(kAutoupdateInstallFailed, nil);
   ASSERT_FALSE([lastText isEqual:[[about_window_controller_
                                   updateText] stringValue]]);
 }
 
 }  // namespace