Cleanup file name and unused import.

- keychain_mock_mac -> mock_keychain_mac to follow file naming conventions.
- remove unused i18n header.

BUG=none
TEST=none

Patch by: Benjamin Lerman <qsr@google.com>
Original review: http://codereview.chromium.org/6875006/

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82284 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 12 insertions, 13 deletions

diff --git a/chrome/browser/keychain_mock_mac.cc b/chrome/browser/mock_keychain_mac.cc
index 3114863..e91f7d6 100644
--- a/chrome/browser/keychain_mock_mac.cc
+++ b/chrome/browser/mock_keychain_mac.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #include "base/logging.h"
 #include "base/time.h"
-#include "chrome/browser/keychain_mock_mac.h"
+#include "chrome/browser/mock_keychain_mac.h"
 
 MockKeychain::MockKeychain(unsigned int item_capacity)
     : item_capacity_(item_capacity), item_count_(0), search_copy_count_(0),
diff --git a/chrome/browser/keychain_mock_mac.h b/chrome/browser/mock_keychain_mac.h
index 60c1711..f614cef 100644
--- a/chrome/browser/keychain_mock_mac.h
+++ b/chrome/browser/mock_keychain_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 CHROME_BROWSER_KEYCHAIN_MOCK_MAC_H_
-#define CHROME_BROWSER_KEYCHAIN_MOCK_MAC_H_
+#ifndef CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
+#define CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
 #pragma once
 
 #include <set>
@@ -190,4 +190,4 @@ class MockKeychain : public MacKeychain {
   mutable std::string add_generic_password_;
 };
 
-#endif  // CHROME_BROWSER_KEYCHAIN_MOCK_MAC_H_
+#endif  // CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
diff --git a/chrome/browser/password_manager/encryptor_password_mac.mm b/chrome/browser/password_manager/encryptor_password_mac.mm
index 5488f4c..a955043 100644
--- a/chrome/browser/password_manager/encryptor_password_mac.mm
+++ b/chrome/browser/password_manager/encryptor_password_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,7 +8,6 @@
 
 #include "chrome/browser/keychain_mac.h"
 #include "chrome/browser/sync/util/crypto_helpers.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/password_manager/encryptor_password_mac_unittest.cc b/chrome/browser/password_manager/encryptor_password_mac_unittest.cc
index b17af55..d15fc9f 100644
--- a/chrome/browser/password_manager/encryptor_password_mac_unittest.cc
+++ b/chrome/browser/password_manager/encryptor_password_mac_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#include "chrome/browser/keychain_mock_mac.h"
+#include "chrome/browser/mock_keychain_mac.h"
 #include "chrome/browser/password_manager/encryptor_password_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 3deabb3..9bb2e9e 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
-#include "chrome/browser/keychain_mock_mac.h"
+#include "chrome/browser/mock_keychain_mac.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/password_manager/password_store_mac.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4f5f03b..d1963c9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1400,13 +1400,13 @@
         'browser/importer/toolbar_importer_unittest.cc',
         'browser/instant/instant_loader_manager_unittest.cc',
         'browser/instant/promo_counter_unittest.cc',
-        'browser/keychain_mock_mac.cc',
-        'browser/keychain_mock_mac.h',
         'browser/mach_broker_mac_unittest.cc',
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_response_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
         'browser/metrics/thread_watcher_unittest.cc',
+        'browser/mock_keychain_mac.cc',
+        'browser/mock_keychain_mac.h',
         'browser/mock_plugin_exceptions_table_model.cc',
         'browser/mock_plugin_exceptions_table_model.h',
         'browser/net/connection_tester_unittest.cc',