Clean up a few more unused globals.

Found by clang's new -Wunused-const-variable.

BUG=290204
R=akalin@chromium.org, avi@chromium.org, isherman@chromium.org, jamesr@chromium.org, joi@chromium.org, sergeyu@chromium.org, sky@chromium.org, thestig@chromium.org, xhwang@chromium.org

Review URL: https://codereview.chromium.org/24649002

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

126 files changed, 260 insertions, 645 deletions

diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index 5242c93..369d05d 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -22,11 +22,6 @@
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 
-namespace {
-
-// Measured in seconds.
-const double kContextRecreationTickRate = 0.03;
-
 // Measured in seconds.
 const double kSmoothnessTakesPriorityExpirationDelay = 0.25;
 
@@ -35,8 +30,6 @@ const double kCommitAndActivationDurationEstimationPercentile = 50.0;
 const double kDrawDurationEstimationPercentile = 100.0;
 const int kDrawDurationEstimatePaddingInMicroseconds = 0;
 
-}  // namespace
-
 namespace cc {
 
 struct ThreadProxy::ReadbackRequest {
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c7627f6..bacbfe4 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -280,6 +280,7 @@ const Experiment::Choice kSimpleCacheBackendChoices[] = {
     switches::kUseSimpleCacheBackend, "on"}
 };
 
+#if defined(USE_AURA)
 const Experiment::Choice kTabCaptureUpscaleQualityChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_TAB_CAPTURE_SCALE_QUALITY_FAST,
@@ -299,6 +300,7 @@ const Experiment::Choice kTabCaptureDownscaleQualityChoices[] = {
   { IDS_FLAGS_TAB_CAPTURE_SCALE_QUALITY_BEST,
     switches::kTabCaptureDownscaleQuality, "best" },
 };
+#endif
 
 const Experiment::Choice kMapImageChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 07f250c..83c1c06 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -32,13 +32,6 @@
 
 namespace {
 
-// This preference is used to track whether the KeychainReauthorize operation
-// has occurred at launch. This operation only makes sense while the
-// application continues to be signed by the old certificate.
-NSString* const kKeychainReauthorizeAtLaunchPref =
-    @"KeychainReauthorizeInAppMay2012";
-const int kKeychainReauthorizeAtLaunchMaxTries = 2;
-
 // Some users rarely restart Chrome, so they might never get a chance to run
 // the at-launch KeychainReauthorize. To account for them, there's also an
 // at-update KeychainReauthorize option, which runs from .keystone_install for
diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc
index bc814f2..948e682 100644
--- a/chrome/browser/component_updater/component_updater_configurator.cc
+++ b/chrome/browser/component_updater/component_updater_configurator.cc
@@ -35,8 +35,6 @@ const char kSwitchFastUpdate[] = "fast-update";
 const char kSwitchOutOfProcess[] = "out-of-process";
 // Add "testrequest=1" parameter to the update check query.
 const char kSwitchRequestParam[] = "test-request";
-// Disables differential updates.
-const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
 // Disables pings. Pings are the requests sent to the update server that report
 // the success or the failure of component install or update attempts.
 extern const char kSwitchDisablePings[] = "disable-pings";
@@ -52,6 +50,11 @@ const char kDefaultUrlSource[] =
 // The url to send the pings to.
 const char kPingUrl[] = "http://tools.google.com/service/update2";
 
+#if defined(OS_WIN)
+// Disables differential updates.
+const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
+#endif  // defined(OS_WIN)
+
 // Returns true if and only if |test| is contained in |vec|.
 bool HasSwitchValue(const std::vector<std::string>& vec, const char* test) {
   if (vec.empty())
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index e463a8e..01a9da8 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -45,14 +45,20 @@ using content::PluginService;
 
 namespace {
 
+// File name of the Pepper Flash component manifest on different platforms.
+const char kPepperFlashManifestName[] = "Flapper";
+
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
 const uint8 kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
                            0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
                            0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
                            0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c};
 
-// File name of the Pepper Flash component manifest on different platforms.
-const char kPepperFlashManifestName[] = "Flapper";
+// If we don't have a Pepper Flash component, this is the version we claim.
+const char kNullVersion[] = "0.0.0.0";
+
+#endif  // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 
 // Name of the Pepper Flash OS in the component manifest.
 const char kPepperFlashOperatingSystem[] =
@@ -74,9 +80,6 @@ const char kPepperFlashArch[] =
     "???";
 #endif
 
-// If we don't have a Pepper Flash component, this is the version we claim.
-const char kNullVersion[] = "0.0.0.0";
-
 // The base directory on Windows looks like:
 // <profile>\AppData\Local\Google\Chrome\User Data\PepperFlash\.
 base::FilePath GetPepperFlashBaseDirectory() {
diff --git a/chrome/browser/devtools/adb_client_socket.cc b/chrome/browser/devtools/adb_client_socket.cc
index 98e9065..e9d1959 100644
--- a/chrome/browser/devtools/adb_client_socket.cc
+++ b/chrome/browser/devtools/adb_client_socket.cc
@@ -18,7 +18,6 @@
 namespace {
 
 const int kBufferSize = 16 * 1024;
-const int kResponseBufferSize = 16;
 const char kOkayResponse[] = "OKAY";
 const char kHostTransportCommand[] = "host:transport:%s";
 const char kLocalhost[] = "127.0.0.1";
diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc
index ca2fcdf..f9f6617 100644
--- a/chrome/browser/devtools/devtools_adb_bridge.cc
+++ b/chrome/browser/devtools/devtools_adb_bridge.cc
@@ -41,31 +41,34 @@ using content::BrowserThread;
 
 namespace {
 
-static const char kDevToolsAdbBridgeThreadName[] = "Chrome_DevToolsADBThread";
-static const char kHostDevicesCommand[] = "host:devices";
-static const char kHostTransportCommand[] = "host:transport:%s|%s";
-static const char kLocalAbstractCommand[] = "localabstract:%s";
-static const char kDeviceModelCommand[] = "shell:getprop ro.product.model";
-static const char kLocalChrome[] = "Local Chrome";
-static const char kChrome[] = "Chrome";
-static const char kOpenedUnixSocketsCommand[] = "shell:cat /proc/net/unix";
-static const char kListProcessesCommand[] = "shell:ps";
-static const char kDumpsysCommand[] = "shell:dumpsys window policy";
-static const char kDumpsysScreenSizePrefix[] = "mStable=";
-
-static const char kPageListRequest[] = "GET /json HTTP/1.1\r\n\r\n";
-static const char kVersionRequest[] = "GET /json/version HTTP/1.1\r\n\r\n";
-static const char kClosePageRequest[] = "GET /json/close/%s HTTP/1.1\r\n\r\n";
-static const char kNewPageRequest[] = "GET /json/new HTTP/1.1\r\n\r\n";
-static const char kActivatePageRequest[] =
+const char kDevToolsAdbBridgeThreadName[] = "Chrome_DevToolsADBThread";
+const char kHostDevicesCommand[] = "host:devices";
+const char kHostTransportCommand[] = "host:transport:%s|%s";
+const char kLocalAbstractCommand[] = "localabstract:%s";
+const char kDeviceModelCommand[] = "shell:getprop ro.product.model";
+const char kOpenedUnixSocketsCommand[] = "shell:cat /proc/net/unix";
+const char kListProcessesCommand[] = "shell:ps";
+const char kDumpsysCommand[] = "shell:dumpsys window policy";
+const char kDumpsysScreenSizePrefix[] = "mStable=";
+
+const char kPageListRequest[] = "GET /json HTTP/1.1\r\n\r\n";
+const char kVersionRequest[] = "GET /json/version HTTP/1.1\r\n\r\n";
+const char kClosePageRequest[] = "GET /json/close/%s HTTP/1.1\r\n\r\n";
+const char kNewPageRequest[] = "GET /json/new HTTP/1.1\r\n\r\n";
+const char kActivatePageRequest[] =
     "GET /json/activate/%s HTTP/1.1\r\n\r\n";
 const int kAdbPort = 5037;
 const int kBufferSize = 16 * 1024;
 const int kAdbPollingIntervalMs = 1000;
 
-static const char kUrlParam[] = "url";
-static const char kPageReloadCommand[] = "Page.reload";
-static const char kPageNavigateCommand[] = "Page.navigate";
+const char kUrlParam[] = "url";
+const char kPageReloadCommand[] = "Page.reload";
+const char kPageNavigateCommand[] = "Page.navigate";
+
+#if defined(DEBUG_DEVTOOLS)
+const char kChrome[] = "Chrome";
+const char kLocalChrome[] = "Local Chrome";
+#endif  // defined(DEBUG_DEVTOOLS)
 
 typedef DevToolsAdbBridge::Callback Callback;
 typedef std::vector<scoped_refptr<DevToolsAdbBridge::AndroidDevice> >
diff --git a/chrome/browser/drive/drive_api_util.cc b/chrome/browser/drive/drive_api_util.cc
index 8606dc2..776ea5c 100644
--- a/chrome/browser/drive/drive_api_util.cc
+++ b/chrome/browser/drive/drive_api_util.cc
@@ -28,11 +28,8 @@ namespace {
 // Google Apps MIME types:
 const char kGoogleDocumentMimeType[] = "application/vnd.google-apps.document";
 const char kGoogleDrawingMimeType[] = "application/vnd.google-apps.drawing";
-const char kGoogleFormMimeType[] = "application/vnd.google-apps.form";
 const char kGooglePresentationMimeType[] =
     "application/vnd.google-apps.presentation";
-const char kGoogleScriptMimeType[] = "application/vnd.google-apps.script";
-const char kGoogleSiteMimeType[] = "application/vnd.google-apps.site";
 const char kGoogleSpreadsheetMimeType[] =
     "application/vnd.google-apps.spreadsheet";
 const char kGoogleTableMimeType[] = "application/vnd.google-apps.table";
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
index 9532f61..d48d2e8 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
@@ -51,8 +51,6 @@ const char kFailedToConnect[] = "Connection failed";
 const char kInvalidDevice[] = "Invalid device";
 const char kInvalidUuid[] = "Invalid UUID";
 const char kPermissionDenied[] = "Permission to add profile denied.";
-const char kPlatformNotSupported[] =
-    "This operation is not supported on your platform";
 const char kProfileAlreadyRegistered[] =
     "This profile has already been registered";
 const char kProfileNotFound[] = "Profile not found: invalid uuid";
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
index 45ff85f..fcee907 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -38,7 +38,6 @@ namespace extensions {
 
 namespace {
 // Error messages.
-const char kUnknownConditionAttribute[] = "Unknown matching condition: '*'";
 const char kInvalidValue[] = "Condition '*' has an invalid value";
 
 struct WebRequestConditionAttributeFactory {
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index 945ec93..533017f 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -16,8 +16,6 @@ namespace extensions {
 
 namespace {
 
-const char kNotImplementedError[] =
-    "Desktop Capture API is not yet implemented for this platform.";
 const char kInvalidSourceNameError[] = "Invalid source type specified.";
 const char kEmptySourcesListError[] =
     "At least one source type must be specified.";
@@ -101,6 +99,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
         screen_capturer.Pass(), window_capturer.Pass()));
     picker_ = DesktopMediaPicker::Create();
 #else
+    const char kNotImplementedError[] =
+        "Desktop Capture API is not yet implemented for this platform.";
     error_ = kNotImplementedError;
     return false;
 #endif
diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc
index 8faa056..1b8b962 100644
--- a/chrome/browser/extensions/api/history/history_api.cc
+++ b/chrome/browser/extensions/api/history/history_api.cc
@@ -57,7 +57,6 @@ namespace Search = api::history::Search;
 
 namespace {
 
-const char kInvalidIdError[] = "History item id is invalid.";
 const char kInvalidUrlError[] = "Url is invalid.";
 const char kDeleteProhibitedError[] = "Browsing history is not allowed to be "
                                       "deleted.";
diff --git a/chrome/browser/extensions/api/image_writer_private/error_messages.cc b/chrome/browser/extensions/api/image_writer_private/error_messages.cc
index 5b7060d9..0f193da 100644
--- a/chrome/browser/extensions/api/image_writer_private/error_messages.cc
+++ b/chrome/browser/extensions/api/image_writer_private/error_messages.cc
@@ -23,7 +23,6 @@ const char kImageBurnerError[] = "Error contacting Image Burner process.";
 const char kImageMD5[] = "Failed to calculate MD5 sum for unzipped image.";
 const char kImageNotFound[] = "Unpacked image not found.";
 const char kImageSize[] = "Could not determine image size.";
-const char kInvalidFileEntry[] = "Invalid file entry.";
 const char kInvalidUrl[] = "Invalid URL provided.";
 const char kMultiFileZip[] = "More than one file in zip."
                              " Unsure how to proceed.";
diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc
index d4b82b6..cd29d98 100644
--- a/chrome/browser/extensions/api/messaging/message_service.cc
+++ b/chrome/browser/extensions/api/messaging/message_service.cc
@@ -58,14 +58,10 @@ using content::WebContents;
 
 namespace extensions {
 
-namespace {
 const char kReceivingEndDoesntExistError[] =
     "Could not establish connection. Receiving end does not exist.";
 const char kMissingPermissionError[] =
     "Access to native messaging requires nativeMessaging permission.";
-const char kNativeMessagingNotSupportedError[] =
-    "Native Messaging is not supported on this platform.";
-}
 
 struct MessageService::MessageChannel {
   scoped_ptr<MessagePort> opener;
@@ -358,6 +354,8 @@ void MessageService::OpenChannelToNativeApp(
 
   AddChannel(channel.release(), receiver_port_id);
 #else  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
+  const char kNativeMessagingNotSupportedError[] =
+      "Native Messaging is not supported on this platform.";
   DispatchOnDisconnect(
       source, receiver_port_id, kNativeMessagingNotSupportedError);
 #endif  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
index 0f8992e..46ae624 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
@@ -24,9 +24,11 @@ namespace extensions {
 
 namespace {
 
+#if defined(OS_WIN)
 // Name of the command line switch used to pass handle of the native view to
 // the native messaging host.
 const char kParentWindowSwitchName[] = "parent-window";
+#endif  // defined(OS_WIN)
 
 base::FilePath GetHostManifestPathFromCommandLine(
     const std::string& native_host_name) {
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index bd4054d..af0b67d 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -36,7 +36,6 @@ namespace notifications = api::notifications;
 
 namespace {
 
-const char kResultKey[] = "result";
 const char kMissingRequiredPropertiesForCreateNotification[] =
     "Some of the required properties are missing: type, iconUrl, title and "
     "message.";
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 585b39e..55c7da8 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -36,12 +36,6 @@ namespace SetDefaultSuggestion = omnibox::SetDefaultSuggestion;
 namespace {
 
 const char kSuggestionContent[] = "content";
-const char kSuggestionDescription[] = "description";
-const char kSuggestionDescriptionStyles[] = "descriptionStyles";
-const char kSuggestionDescriptionStylesRaw[] = "descriptionStylesRaw";
-const char kDescriptionStylesType[] = "type";
-const char kDescriptionStylesOffset[] = "offset";
-const char kDescriptionStylesLength[] = "length";
 const char kCurrentTabDisposition[] = "currentTab";
 const char kForegroundTabDisposition[] = "newForegroundTab";
 const char kBackgroundTabDisposition[] = "newBackgroundTab";
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
index 5e7e04f..cae3129 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
@@ -37,14 +37,11 @@
 
 using content::BrowserThread;
 
-namespace {
 const char kChannelIdSeparator[] = "/";
 const char kUserNotSignedIn[] = "The user is not signed in.";
 const char kUserAccessTokenFailure[] =
     "Cannot obtain access token for the user.";
-const char kTokenServiceNotAvailable[] = "Failed to get token service.";
 const int kObfuscatedGaiaIdTimeoutInDays = 30;
-}
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index 51f95ec..6dc8125 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -42,7 +42,6 @@ namespace {
 
 // Error messages.
 const char kFileError[] = "File error %d.";
-const char kQuotaError[] = "Quota error %d.";
 const char kUnsupportedConflictResolutionPolicy[] =
     "Policy %s is not supported.";
 
diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc
index ec42006..4a5654b 100644
--- a/chrome/browser/extensions/api/system_private/system_private_api.cc
+++ b/chrome/browser/extensions/api/system_private/system_private_api.cc
@@ -39,9 +39,12 @@ const char kVolumeKey[] = "volume";
 
 // System update states.
 const char kNotAvailableState[] = "NotAvailable";
-const char kUpdatingState[] = "Updating";
 const char kNeedRestartState[] = "NeedRestart";
 
+#if defined(OS_CHROMEOS)
+const char kUpdatingState[] = "Updating";
+#endif  // defined(OS_CHROMEOS)
+
 // Dispatches an extension event with |argument|
 void DispatchEvent(const std::string& event_name, base::Value* argument) {
   scoped_ptr<base::ListValue> list_args(new base::ListValue());
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
index 2890c06..4b3b165 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
@@ -41,7 +41,6 @@ namespace {
 const char kCapturingSameTab[] = "Cannot capture a tab with an active stream.";
 const char kFindingTabError[] = "Error finding tab to capture.";
 const char kNoAudioOrVideo[] = "Capture failed. No audio or video requested.";
-const char kPermissionError[] = "Tab Capture API flag is not enabled.";
 const char kGrantError[] =
     "Extension has not been invoked for the current page (see activeTab "
     "permission). Chrome pages cannot be captured.";
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index cb3a2d0..b81f480 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -61,12 +61,6 @@ using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::TabHelper);
 
-namespace {
-
-const char kPermissionError[] = "permission_error";
-
-}  // namespace
-
 namespace extensions {
 
 TabHelper::ScriptExecutionObserver::ScriptExecutionObserver(
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index e32a939..ab1d1c9 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -62,7 +62,6 @@ namespace {
 const char kApprovalKey[] = "extensions.webstore_installer";
 
 const char kInvalidIdError[] = "Invalid id";
-const char kNoBrowserError[] = "No browser found";
 const char kDownloadDirectoryError[] = "Could not create download directory";
 const char kDownloadCanceledError[] = "Download canceled";
 const char kInstallCanceledError[] = "Install canceled";
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index 7c6f969..c9a2f96 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -27,7 +27,6 @@ const char kUsersKey[] = "users";
 const char kShowUserCountKey[] = "show_user_count";
 const char kAverageRatingKey[] = "average_rating";
 const char kRatingCountKey[] = "rating_count";
-const char kRedirectUrlKey[] = "redirect_url";
 
 const char kInvalidWebstoreItemId[] = "Invalid Chrome Web Store item ID";
 const char kWebstoreRequestError[] =
diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc
index 29e928e..6b13f2c 100644
--- a/chrome/browser/feedback/feedback_util.cc
+++ b/chrome/browser/feedback/feedback_util.cc
@@ -127,8 +127,11 @@ const int64 kRetryDelayLimit = 14400000;  // 4 hours
 const char kArbitraryMimeType[] = "application/octet-stream";
 const char kLogsAttachmentName[] = "system_logs.zip";
 
+#if defined(OS_CHROMEOS)
 const int kChromeOSProductId = 208;
+#else
 const int kChromeBrowserProductId = 237;
+#endif
 
 // Simple net::URLFetcherDelegate to clean up URLFetcher on completion.
 class PostCleanup : public net::URLFetcherDelegate {
diff --git a/chrome/browser/google_apis/drive_api_requests.cc b/chrome/browser/google_apis/drive_api_requests.cc
index 294d7ca..fc21c1a 100644
--- a/chrome/browser/google_apis/drive_api_requests.cc
+++ b/chrome/browser/google_apis/drive_api_requests.cc
@@ -20,7 +20,6 @@ namespace google_apis {
 namespace {
 
 const char kContentTypeApplicationJson[] = "application/json";
-const char kDirectoryMimeType[] = "application/vnd.google-apps.folder";
 const char kParentLinkKind[] = "drive#fileLink";
 
 // Parses the JSON value to a resource typed |T| and runs |callback| on the UI
diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc
index 2ee0bb5..8e291f5 100644
--- a/chrome/browser/google_apis/gdata_wapi_parser.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser.cc
@@ -27,42 +27,10 @@ namespace google_apis {
 namespace {
 
 // Term values for kSchemeKind category:
-const char kSchemeKind[] = "http://schemas.google.com/g/2005#kind";
 const char kTermPrefix[] = "http://schemas.google.com/docs/2007#";
-const char kFileTerm[] = "file";
-const char kFolderTerm[] = "folder";
-const char kItemTerm[] = "item";
-const char kPdfTerm[] = "pdf";
-const char kDocumentTerm[] = "document";
-const char kSpreadSheetTerm[] = "spreadsheet";
-const char kPresentationTerm[] = "presentation";
-
-const char kSchemeLabels[] = "http://schemas.google.com/g/2005/labels";
 
 // Node names.
-const char kAuthorNode[] = "author";
-const char kCategoryNode[] = "category";
-const char kContentNode[] = "content";
-const char kEditedNode[] = "edited";
-const char kEmailNode[] = "email";
 const char kEntryNode[] = "entry";
-const char kFeedLinkNode[] = "feedLink";
-const char kFilenameNode[] = "filename";
-const char kIDNode[] = "id";
-const char kLastModifiedByNode[] = "lastModifiedBy";
-const char kLastViewedNode[] = "lastViewed";
-const char kLinkNode[] = "link";
-const char kMd5ChecksumNode[] = "md5Checksum";
-const char kModifiedByMeDateNode[] = "modifiedByMeDate";
-const char kNameNode[] = "name";
-const char kPublishedNode[] = "published";
-const char kQuotaBytesUsedNode[] = "quotaBytesUsed";
-const char kResourceIdNode[] = "resourceId";
-const char kSizeNode[] = "size";
-const char kSuggestedFilenameNode[] = "suggestedFilename";
-const char kTitleNode[] = "title";
-const char kUpdatedNode[] = "updated";
-const char kWritersCanInviteNode[] = "writersCanInvite";
 
 // Field names.
 const char kAuthorField[] = "author";
@@ -120,20 +88,6 @@ const char kTitleTField[] = "title.$t";
 const char kTypeField[] = "type";
 const char kUpdatedField[] = "updated.$t";
 
-// Attribute names.
-// Attributes are not namespace-blind as node names in XmlReader.
-const char kETagAttr[] = "gd:etag";
-const char kEmailAttr[] = "email";
-const char kHrefAttr[] = "href";
-const char kLabelAttr[] = "label";
-const char kNameAttr[] = "name";
-const char kRelAttr[] = "rel";
-const char kSchemeAttr[] = "scheme";
-const char kSrcAttr[] = "src";
-const char kTermAttr[] = "term";
-const char kTypeAttr[] = "type";
-const char kValueAttr[] = "value";
-
 // Link Prefixes
 const char kOpenWithPrefix[] = "http://schemas.google.com/docs/2007#open-with-";
 const size_t kOpenWithPrefixSize = arraysize(kOpenWithPrefix) - 1;
diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index aa7ede3..10460d4 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -136,14 +136,6 @@ const int kExpirationDelaySec = 30;
 // iteration, so we want to wait longer before checking to avoid wasting CPU.
 const int kExpirationEmptyDelayMin = 5;
 
-// The number of minutes that we wait for before scheduling a task to
-// delete old history index files.
-const int kIndexExpirationDelayMin = 2;
-
-// The number of the most recent months for which we do not want to delete
-// the history index files.
-const int kStoreHistoryIndexesForMonths = 3;
-
 }  // namespace
 
 struct ExpireHistoryBackend::DeleteDependencies {
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 07f18ed..e23a51e 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -80,29 +80,25 @@ namespace history {
 // This value needs to be greater or equal to
 // MostVisitedModel::kMostVisitedScope but we don't want to introduce a direct
 // dependency between MostVisitedModel and the history backend.
-static const int kSegmentDataRetention = 90;
+const int kSegmentDataRetention = 90;
 
 // How long we'll wait to do a commit, so that things are batched together.
-static const int kCommitIntervalSeconds = 10;
+const int kCommitIntervalSeconds = 10;
 
 // The amount of time before we re-fetch the favicon.
-static const int kFaviconRefetchDays = 7;
-
-// GetSessionTabs returns all open tabs, or tabs closed kSessionCloseTimeWindow
-// seconds ago.
-static const int kSessionCloseTimeWindowSecs = 10;
+const int kFaviconRefetchDays = 7;
 
 // The maximum number of items we'll allow in the redirect list before
 // deleting some.
-static const int kMaxRedirectCount = 32;
+const int kMaxRedirectCount = 32;
 
 // The number of days old a history entry can be before it is considered "old"
 // and is archived.
-static const int kArchiveDaysThreshold = 90;
+const int kArchiveDaysThreshold = 90;
 
 #if defined(OS_ANDROID)
 // The maximum number of top sites to track when recording top page visit stats.
-static const size_t kPageVisitStatsMaxTopSites = 50;
+const size_t kPageVisitStatsMaxTopSites = 50;
 #endif
 
 // Converts from PageUsageData to MostVisitedURL. |redirects| is a
diff --git a/chrome/browser/history/in_memory_url_index_types.cc b/chrome/browser/history/in_memory_url_index_types.cc
index 1006b50..9307d5b 100644
--- a/chrome/browser/history/in_memory_url_index_types.cc
+++ b/chrome/browser/history/in_memory_url_index_types.cc
@@ -18,17 +18,6 @@
 
 namespace history {
 
-// The maximum score any candidate result can achieve.
-const int kMaxTotalScore = 1425;
-
-// Score ranges used to get a 'base' score for each of the scoring factors
-// (such as recency of last visit, times visited, times the URL was typed,
-// and the quality of the string match). There is a matching value range for
-// each of these scores for each factor. Note that the top score is greater
-// than |kMaxTotalScore|. The score for each candidate will be capped in the
-// final calculation.
-const int kScoreRank[] = { 1450, 1200, 900, 400 };
-
 // Matches within URL and Title Strings ----------------------------------------
 
 string16 CleanUpUrlForMatching(const GURL& gurl,
diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc
index d516c73..41d6c84 100644
--- a/chrome/browser/managed_mode/managed_mode_site_list.cc
+++ b/chrome/browser/managed_mode/managed_mode_site_list.cc
@@ -18,7 +18,6 @@ const int kSitelistFormatVersion = 1;
 
 const char kCategoriesKey[] = "categories";
 const char kHostnameHashesKey[] = "hostname_hashes";
-const char kIdKey[] = "id";
 const char kNameKey[] = "name";
 const char kSitesKey[] = "sites";
 const char kSitelistFormatVersionKey[] = "version";
diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.cc b/chrome/browser/managed_mode/managed_user_registration_utility.cc
index ee67a48..e2b75b5 100644
--- a/chrome/browser/managed_mode/managed_user_registration_utility.cc
+++ b/chrome/browser/managed_mode/managed_user_registration_utility.cc
@@ -29,10 +29,6 @@ using base::DictionaryValue;
 
 namespace {
 
-const char kAcknowledged[] = "acknowledged";
-const char kName[] = "name";
-const char kMasterKey[] = "masterKey";
-
 ManagedUserRegistrationUtility* g_instance_for_tests = NULL;
 
 // Actual implementation of ManagedUserRegistrationUtility.
diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc
index 3ee0c05..bf3efca 100644
--- a/chrome/browser/notifications/balloon_collection_impl.cc
+++ b/chrome/browser/notifications/balloon_collection_impl.cc
@@ -21,8 +21,6 @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 
-namespace {
-
 // Portion of the screen allotted for notifications. When notification balloons
 // extend over this, no new notifications are shown until some are closed.
 const double kPercentBalloonFillFactor = 0.7;
@@ -30,14 +28,15 @@ const double kPercentBalloonFillFactor = 0.7;
 // Allow at least this number of balloons on the screen.
 const int kMinAllowedBalloonCount = 2;
 
+// The spacing between the balloon and the panel.
+const int kVerticalSpacingBetweenBalloonAndPanel = 5;
+
+#if USE_OFFSETS
 // Delay from the mouse leaving the balloon collection before
 // there is a relayout, in milliseconds.
 const int kRepositionDelayMs = 300;
+#endif  // USE_OFFSETS
 
-// The spacing between the balloon and the panel.
-const int kVerticalSpacingBetweenBalloonAndPanel = 5;
-
-}  // namespace
 
 BalloonCollectionImpl::BalloonCollectionImpl()
 #if USE_OFFSETS
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index 2442028..7aa64dc 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -35,11 +35,11 @@
 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 #endif
 
-namespace {
+#if defined(OS_WIN)
 // The first-run balloon will be shown |kFirstRunIdleDelaySeconds| after all
 // popups go away and the user has notifications in the message center.
 const int kFirstRunIdleDelaySeconds = 1;
-}  // namespace
+#endif
 
 MessageCenterNotificationManager::MessageCenterNotificationManager(
     message_center::MessageCenter* message_center,
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_store.cc b/chrome/browser/policy/cloud/component_cloud_policy_store.cc
index 3a9c5d6..334f9d6 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_store.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_store.cc
@@ -27,7 +27,6 @@ namespace {
 
 const char kValue[] = "Value";
 const char kLevel[] = "Level";
-const char kMandatory[] = "Mandatory";
 const char kRecommended[] = "Recommended";
 
 const struct DomainConstants {
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index 2b8ad4e..74819f7 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/chrome/browser/printing/print_system_task_proxy.cc
@@ -24,17 +24,11 @@
 
 using content::BrowserThread;
 
-namespace {
-
 const char kPrinterId[] = "printerId";
 const char kDisableColorOption[] = "disableColorOption";
 const char kSetDuplexAsDefault[] = "setDuplexAsDefault";
-const char kPrinterColorModelForBlack[] = "printerColorModelForBlack";
-const char kPrinterColorModelForColor[] = "printerColorModelForColor";
 const char kPrinterDefaultDuplexValue[] = "printerDefaultDuplexValue";
 
-}  // namespace
-
 PrintSystemTaskProxy::PrintSystemTaskProxy(
     const base::WeakPtr<PrintPreviewHandler>& handler,
     printing::PrintBackend* print_backend,
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index b3351bf..534fa4e 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -43,12 +43,10 @@
 using base::TimeDelta;
 using content::BrowserThread;
 
-namespace {
-
+#if defined(OS_WIN)
 // Limits memory usage by raster to 64 MiB.
 const int kMaxRasterSizeInPixels = 16*1024*1024;
-
-}  // namespace
+#endif
 
 namespace printing {
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 241675e..2cfbd67 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -63,31 +63,23 @@ const char* const kSbDiagnosticUrl =
     "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%s&client=chromium";
 #endif
 
-const char* const kSbReportPhishingErrorUrl =
+const char kSbReportPhishingErrorUrl[] =
     "http://www.google.com/safebrowsing/report_error/";
 
 // URL for the "Learn more" link on the multi threat malware blocking page.
-const char* const kLearnMoreMalwareUrl =
+const char kLearnMoreMalwareUrl[] =
     "https://www.google.com/support/bin/answer.py?answer=45449&topic=360"
     "&sa=X&oi=malwarewarninglink&resnum=1&ct=help";
-const char* const kLearnMoreMalwareUrlV2 =
+const char kLearnMoreMalwareUrlV2[] =
     "https://www.google.com/goodtoknow/online-safety/malware/";
-const char* const kLearnMorePhishingUrlV2 =
+const char kLearnMorePhishingUrlV2[] =
     "https://www.google.com/goodtoknow/online-safety/phishing/";
 
 // URL for the "Learn more" link on the phishing blocking page.
-const char* const kLearnMorePhishingUrl =
+const char kLearnMorePhishingUrl[] =
     "https://www.google.com/support/bin/answer.py?answer=106318";
 
-const char* const kSbDiagnosticHtml =
-    "<a href=\"\" onclick=\"sendCommand('showDiagnostic'); return false;\" "
-    "onmousedown=\"return false;\">%s</a>";
-
-const char* const kPLinkHtml =
-    "<a href=\"\" onclick=\"sendCommand('proceed'); return false;\" "
-    "onmousedown=\"return false;\">%s</a>";
-
-const char* const kPrivacyLinkHtml =
+const char kPrivacyLinkHtml[] =
     "<a id=\"privacy-link\" href=\"\" onclick=\"sendCommand('showPrivacy'); "
     "return false;\" onmousedown=\"return false;\">%s</a>";
 
@@ -98,43 +90,37 @@ const char* const kPrivacyLinkHtml =
 const int64 kMalwareDetailsProceedDelayMilliSeconds = 3000;
 
 // The commands returned by the page when the user performs an action.
-const char* const kShowDiagnosticCommand = "showDiagnostic";
-const char* const kReportErrorCommand = "reportError";
-const char* const kLearnMoreCommand = "learnMore";
-const char* const kLearnMoreCommandV2 = "learnMore2";
-const char* const kShowPrivacyCommand = "showPrivacy";
-const char* const kProceedCommand = "proceed";
-const char* const kTakeMeBackCommand = "takeMeBack";
-const char* const kDoReportCommand = "doReport";
-const char* const kDontReportCommand = "dontReport";
-const char* const kDisplayCheckBox = "displaycheckbox";
-const char* const kBoxChecked = "boxchecked";
-const char* const kExpandedSeeMore = "expandedSeeMore";
+const char kShowDiagnosticCommand[] = "showDiagnostic";
+const char kReportErrorCommand[] = "reportError";
+const char kLearnMoreCommand[] = "learnMore";
+const char kLearnMoreCommandV2[] = "learnMore2";
+const char kShowPrivacyCommand[] = "showPrivacy";
+const char kProceedCommand[] = "proceed";
+const char kTakeMeBackCommand[] = "takeMeBack";
+const char kDoReportCommand[] = "doReport";
+const char kDontReportCommand[] = "dontReport";
+const char kDisplayCheckBox[] = "displaycheckbox";
+const char kBoxChecked[] = "boxchecked";
+const char kExpandedSeeMore[] = "expandedSeeMore";
 // Special command that we use when the user navigated away from the
 // page.  E.g., closed the tab or the window.  This is only used by
 // RecordUserReactionTime.
-const char* const kNavigatedAwayMetaCommand = "closed";
+const char kNavigatedAwayMetaCommand[] = "closed";
 
 base::LazyInstance<SafeBrowsingBlockingPage::UnsafeResourceMap>
     g_unsafe_resource_map = LAZY_INSTANCE_INITIALIZER;
 
 // These are the conditions for the summer 2013 Finch experiment.
-const char* const kMalwareStudyName = "InterstitialMalware310";
-const char* const kPhishingStudyName = "InterstitialPhishing564";
-const char* const kCond1MalwareControl = "cond1MalwareControl";
-const char* const kCond2MalwareNoBrand = "cond2MalwareNoBrand";
-const char* const kCond3PhishingControl = "cond3PhishingControl";
-const char* const kCond4PhishingNoBrand = "cond4PhishingNoBrand";
-const char* const kCond5MalwareOneStep = "cond5MalwareOneStep";
-const char* const kCond6PhishingOneStep = "cond6PhishingOneStep";
-const char* const kCond7MalwareFearMsg = "cond7MalwareFearMsg";
-const char* const kCond8PhishingFearMsg = "cond8PhishingFearMsg";
-const char* const kCond9MalwareCollabMsg = "cond9MalwareCollabMsg";
-const char* const kCond10PhishingCollabMsg = "cond10PhishingCollabMsg";
-const char* const kCond11MalwareQuestion = "cond11MalwareQuestion";
-const char* const kCond12PhishingQuestion = "cond12PhishingQuestion";
-const char* const kCond13MalwareGoBack = "cond13MalwareGoBack";
-const char* const kCond14PhishingGoBack = "cond14PhishingGoBack";
+const char kMalwareStudyName[] = "InterstitialMalware310";
+const char kPhishingStudyName[] = "InterstitialPhishing564";
+const char kCond7MalwareFearMsg[] = "cond7MalwareFearMsg";
+const char kCond8PhishingFearMsg[] = "cond8PhishingFearMsg";
+const char kCond9MalwareCollabMsg[] = "cond9MalwareCollabMsg";
+const char kCond10PhishingCollabMsg[] = "cond10PhishingCollabMsg";
+const char kCond11MalwareQuestion[] = "cond11MalwareQuestion";
+const char kCond12PhishingQuestion[] = "cond12PhishingQuestion";
+const char kCond13MalwareGoBack[] = "cond13MalwareGoBack";
+const char kCond14PhishingGoBack[] = "cond14PhishingGoBack";
 
 }  // namespace
 
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 52165f9..10cc1de 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -56,7 +56,6 @@ const uint64 kEmbeddedPageVersionDefault = 2;
 // The staleness timeout can be set (in seconds) via this config.
 const char kStalePageTimeoutFlagName[] = "stale";
 const int kStalePageTimeoutDefault = 3 * 3600;  // 3 hours.
-const int kStalePageTimeoutDisabled = 0;
 
 const char kHideVerbatimFlagName[] = "hide_verbatim";
 const char kUseRemoteNTPOnStartupFlagName[] = "use_remote_ntp_on_startup";
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index 69532d2..db22b8c 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -53,12 +53,6 @@ const char kHTMLType[] = "text/html";
 // Mime type for as you type suggestions.
 const char kSuggestionType[] = "application/x-suggestions+json";
 
-// Namespace identifier.
-const char kOSDNS[] = "xmlns";
-
-// The namespace for documents we understand.
-const char kNameSpace[] = "http://a9.com/-/spec/opensearch/1.1/";
-
 std::string XMLCharToString(const xmlChar* value) {
   return std::string(reinterpret_cast<const char*>(value));
 }
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
index cbd1611..fd64bdd 100644
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -44,9 +44,6 @@ using content::WebContents;
 
 namespace {
 
-const char kStringsJsFile[] = "strings.js";
-const char kSignInPromoJsFile[] = "sync_promo.js";
-
 const char kSignInPromoQueryKeyAutoClose[] = "auto_close";
 const char kSignInPromoQueryKeyContinue[] = "continue";
 const char kSignInPromoQueryKeySource[] = "source";
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 0bc9315..dba4327 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -51,12 +51,9 @@ namespace browser_sync {
 //
 // TODO(ncarter): Pull these tags from an external protocol specification
 // rather than hardcoding them here.
-static const char kBookmarkBarTag[] = "bookmark_bar";
-static const char kMobileBookmarksTag[] = "synced_bookmarks";
-static const char kOtherBookmarksTag[] = "other_bookmarks";
-static const char kServerError[] =
-    "Server did not create top-level nodes.  Possibly we are running against "
-    "an out-of-date server?";
+const char kBookmarkBarTag[] = "bookmark_bar";
+const char kMobileBookmarksTag[] = "synced_bookmarks";
+const char kOtherBookmarksTag[] = "other_bookmarks";
 
 // Bookmark comparer for map of bookmark nodes.
 class BookmarkComparer {
diff --git a/chrome/browser/sync/glue/chrome_report_unrecoverable_error.cc b/chrome/browser/sync/glue/chrome_report_unrecoverable_error.cc
index 66fccc0..2fe9dd4 100644
--- a/chrome/browser/sync/glue/chrome_report_unrecoverable_error.cc
+++ b/chrome/browser/sync/glue/chrome_report_unrecoverable_error.cc
@@ -15,10 +15,11 @@
 
 namespace browser_sync {
 
-static const double kErrorUploadRatio = 0.15;
 void ChromeReportUnrecoverableError() {
   // TODO(lipalani): Add this for other platforms as well.
 #if defined(OS_WIN)
+  const double kErrorUploadRatio = 0.15;
+
   // We only want to upload |kErrorUploadRatio| ratio of errors.
   if (kErrorUploadRatio <= 0.0)
     return; // We are not allowed to upload errors.
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index d108ebf..38a4fee 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -108,9 +108,7 @@ const char* ProfileSyncService::kSyncServerUrl =
 const char* ProfileSyncService::kDevServerUrl =
     "https://clients4.google.com/chrome-sync/dev";
 
-static const int kSyncClearDataTimeoutInSeconds = 60;  // 1 minute.
-
-static const char* kSyncUnrecoverableErrorHistogram =
+const char kSyncUnrecoverableErrorHistogram[] =
     "Sync.UnrecoverableErrors";
 
 const net::BackoffEntry::Policy kRequestAccessTokenBackoffPolicy = {
diff --git a/chrome/browser/sync/sessions2/tab_node_pool2.cc b/chrome/browser/sync/sessions2/tab_node_pool2.cc
index 459186b..70bc225 100644
--- a/chrome/browser/sync/sessions2/tab_node_pool2.cc
+++ b/chrome/browser/sync/sessions2/tab_node_pool2.cc
@@ -15,10 +15,6 @@
 
 namespace browser_sync {
 
-static const char kNoSessionsFolderError[] =
-    "Server did not create the top-level sessions node. We "
-    "might be running against an out-of-date server.";
-
 const size_t TabNodePool2::kFreeNodesLowWatermark = 25;
 const size_t TabNodePool2::kFreeNodesHighWatermark = 100;
 
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
index a3da574..26862a8 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
@@ -71,7 +71,6 @@ const char kDriveMetadataKeyPrefix[] = "METADATA: ";
 const char kMetadataKeySeparator = ' ';
 const char kDriveIncrementalSyncOriginKeyPrefix[] = "ISYNC_ORIGIN: ";
 const char kDriveDisabledOriginKeyPrefix[] = "DISABLED_ORIGIN: ";
-const size_t kDriveMetadataKeyPrefixLength = arraysize(kDriveMetadataKeyPrefix);
 
 enum OriginSyncType {
   INCREMENTAL_SYNC_ORIGIN,
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index c5d22ac..c3f7829 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -61,8 +61,6 @@ using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
-namespace {
-
 const char kReportLanguageDetectionErrorURL[] =
     "https://translate.google.com/translate_error?client=cr&action=langidc";
 
@@ -73,16 +71,10 @@ const char kSourceLanguageQueryName[] = "sl";
 // Used in kReportLanguageDetectionErrorURL to specify the page URL.
 const char kUrlQueryName[] = "u";
 
-// The delay in ms that we'll wait to check if a page has finished loading
-// before attempting a translation.
-const int kTranslateLoadCheckDelayMs = 150;
-
 // The maximum number of attempts we'll do to see if the page has finshed
 // loading before giving up the translation
 const int kMaxTranslateLoadCheckAttempts = 20;
 
-}  // namespace
-
 TranslateManager::~TranslateManager() {
   weak_method_factory_.InvalidateWeakPtrs();
 }
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
index db20a46..973fc2e 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
@@ -28,7 +28,6 @@ const char kKeyResults[] = "results";
 const char kKeyId[] = "id";
 const char kKeyLocalizedName[] = "localized_name";
 const char kKeyIconUrl[] = "icon_url";
-const size_t kMinimumQueryLength = 3u;
 
 // Returns true if the launcher should send queries to the web store server.
 bool UseWebstoreSearch() {
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index d6db9da..4440230 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -39,9 +39,6 @@ const size_t kRowHeight = 24;
 // The vertical height of a separator in pixels.
 const size_t kSeparatorHeight = 1;
 
-// The maximum amount of characters to display from either the name or subtext.
-const size_t kMaxTextLength = 15;
-
 #if !defined(OS_ANDROID)
 const size_t kNamePadding = AutofillPopupView::kNamePadding;
 const size_t kIconPadding = AutofillPopupView::kIconPadding;
diff --git a/chrome/browser/ui/autofill/new_credit_card_bubble_controller.cc b/chrome/browser/ui/autofill/new_credit_card_bubble_controller.cc
index 0159a39b..d13db3d 100644
--- a/chrome/browser/ui/autofill/new_credit_card_bubble_controller.cc
+++ b/chrome/browser/ui/autofill/new_credit_card_bubble_controller.cc
@@ -26,14 +26,6 @@
 
 namespace autofill {
 
-namespace {
-
-static const int kMaxGeneratedCardTimesToShow = 5;
-static const char kWalletGeneratedCardLearnMoreLink[] =
-    "http://support.google.com/wallet/bin/answer.py?hl=en&answer=2740044";
-
-}  // namespace
-
 CreditCardDescription::CreditCardDescription() {}
 CreditCardDescription::~CreditCardDescription() {}
 
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 4580495..acc4a17 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -223,11 +223,6 @@ using WebKit::WebWindowFeatures;
 
 namespace {
 
-// The URL to be loaded to display the "Report a broken page" form.
-const char kBrokenPageUrl[] =
-    "https://www.google.com/support/chrome/bin/request.py?contact_type="
-    "broken_website&format=inproduct&p.page_title=$1&p.page_url=$2";
-
 // How long we wait before updating the browser chrome while loading a page.
 const int kUIUpdateCoalescingTimeMS = 200;
 
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
index ee66dfe..e4b4694 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
@@ -30,12 +30,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/platform_font.h"
 
-namespace {
-
 const CGFloat kAccountChooserHeight = 20.0;
-const CGFloat kRelatedControlVerticalSpacing = 8.0;
-
-}  // namespace;
 
 namespace autofill {
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
index c530a23..5cc38da 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
@@ -22,8 +22,6 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
-const CGFloat kBorderRadius = 3.0;
-
 @interface BookmarkBarToolbarView (Private)
 - (void)drawAsDetachedBubble;
 @end
diff --git a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm
index 474bf21..d8fd880 100644
--- a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm
@@ -13,8 +13,6 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/point.h"
 
-namespace {
-
 // The width for the message text. We break lines so the specified message fits
 // into this width.
 const int kMaxMessageWidth = 400;
@@ -36,9 +34,6 @@ const int kRelatedControlHorizontalSpacing = 8;
 // Vertical spacing between controls that are logically related.
 const int kRelatedControlVerticalSpacing = 8;
 
-// Horizontal spacing between controls that are logically unrelated.
-const int kUnrelatedControlHorizontalSpacing = 12;
-
 // Vertical spacing between the edge of the window and the
 // top or bottom of a button.
 const int kButtonVEdgeMargin = 6;
@@ -47,8 +42,6 @@ const int kButtonVEdgeMargin = 6;
 // left or right of a button.
 const int kButtonHEdgeMargin = 7;
 
-}  // namespace
-
 namespace chrome {
 
 void ShowConfirmBubble(gfx::NativeView view,
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index b407a05..ef4eadd 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -45,10 +45,6 @@ const int kGeoLabelHeight = 14;
 // Height of the "Clear" button in the geolocation bubble.
 const int kGeoClearButtonHeight = 17;
 
-// Padding between radio buttons and "Load all plugins" button
-// in the plugin bubble.
-const int kLoadAllPluginsButtonVerticalPadding = 8;
-
 // General padding between elements in the geolocation bubble.
 const int kGeoPadding = 8;
 
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm
index 4928951..03a37fc1 100644
--- a/chrome/browser/ui/cocoa/download/download_item_cell.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm
@@ -51,9 +51,6 @@ const CGFloat kPrimaryTextOnlyPosTop = 10;
 // y coordinate of status message, in view coords.
 const CGFloat kSecondaryTextPosTop = 18;
 
-// Grey value of status text.
-const CGFloat kSecondaryTextColor = 0.5;
-
 // Width of dropdown area on the right (includes 1px for the border on each
 // side).
 const CGFloat kDropdownAreaWidth = 14;
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm
index 82b0bf0..7c669d5 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm
@@ -24,10 +24,6 @@ const NSInteger kResultsTokenInset = 3;
 // Assumes -setFlipped:YES.
 const NSInteger kResultsYOffset = 4;
 
-// How far the editor insets itself, for purposes of determining if
-// decorations need to be trimmed.
-const CGFloat kEditorHorizontalInset = 3.0;
-
 // Conveniences to centralize width+offset calculations.
 CGFloat WidthForResults(NSAttributedString* resultsString) {
   return kResultsXOffset + ceil([resultsString size].width) +
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index b27a21a..c50a25b 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -28,8 +28,6 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
-namespace {
-const CGFloat kAnimationDuration = 0.12;
 const CGFloat kBottomBorderHeightPx = 1.0;
 const CGFloat kButtonHeightPx = 26.0;
 const CGFloat kButtonLeftMarginPx = 2.0;
@@ -37,7 +35,6 @@ const CGFloat kButtonWidthPx = 34.0;
 const CGFloat kDropArrowLeftMarginPx = 3.0;
 const CGFloat kToolbarMinHeightPx = 36.0;
 const CGFloat kToolbarMaxHeightPx = 72.0;
-}  // namespace
 
 @interface ExtensionInfoBarController(Private)
 // Called when the extension's hosted NSView has been resized.
diff --git a/chrome/browser/ui/cocoa/panels/panel_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
index 0114668..9ab696e 100644
--- a/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
+++ b/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
@@ -16,15 +16,6 @@
 using content::NativeWebKeyboardEvent;
 using content::WebContents;
 
-namespace {
-
-// Use this instead of 0 for minimum size of a window when doing opening and
-// closing animations, since OSX window manager does not like 0-sized windows
-// (according to avi@).
-const int kMinimumWindowSize = 1;
-
-}  // namespace
-
 // This creates a shim window class, which in turn creates a Cocoa window
 // controller which in turn creates actual NSWindow by loading a nib.
 // Overall chain of ownership is:
diff --git a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm
index 223161b..eaf40da 100644
--- a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm
@@ -21,8 +21,6 @@
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/image/image.h"
 
-const int kButtonPadding = 5;
-
 // 'Glint' is a glowing light animation on the titlebar to attract user's
 // attention. Numbers are arbitrary, based on several tries.
 const double kGlintAnimationDuration = 1.5;
diff --git a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
index 51087ef..563c2a1 100644
--- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
+++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
@@ -32,8 +32,6 @@ namespace {
 
 const CGFloat kWindowMinWidth = 500;
 const CGFloat kButtonGap = 6;
-const SkColor kDialogAlertBarBackgroundColor = 0xFFF6F6F6;
-const SkColor kDialogAlertBarBorderColor = 0xFFE1E1E1;
 const CGFloat kDialogAlertBarBorderWidth = 1;
 
 // Shift the origin of |view|'s frame by the given amount in the
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index a8a01d8..911dd5d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -103,10 +103,6 @@ const CGFloat kNewTabButtonOffset = 8.0;
 // Time (in seconds) in which tabs animate to their final position.
 const NSTimeInterval kAnimationDuration = 0.125;
 
-// The amount by which the profile menu button is offset (from tab tabs or new
-// tab button).
-const CGFloat kProfileMenuButtonOffset = 6.0;
-
 // The width and height of the icon + glow for projecting mode.
 const CGFloat kProjectingIconWidthAndHeight = 32.0;
 
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm
index d30443e..8bb0a13 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
@@ -25,8 +25,6 @@ const int kFillHeight = 25;  // Height of the "mask on" part of the mask bitmap.
 
 // Constants for inset and control points for tab shape.
 const CGFloat kInsetMultiplier = 2.0/3.0;
-const CGFloat kControlPoint1Multiplier = 1.0/3.0;
-const CGFloat kControlPoint2Multiplier = 3.0/8.0;
 
 // The amount of time in seconds during which each type of glow increases, holds
 // steady, and decreases, respectively.
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index fde1364..520b951 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -54,9 +54,11 @@ using content::WebPluginInfo;
 
 namespace {
 
-static const char kAdobeReaderIdentifier[] = "adobe-reader";
-static const char kAdobeReaderUpdateUrl[] =
-    "http://www.adobe.com/go/getreader_chrome";
+const char kAdobeReaderUpdateUrl[] = "http://www.adobe.com/go/getreader_chrome";
+
+#if defined(OS_WIN) && defined(ENABLE_PLUGIN_INSTALLATION)
+const char kAdobeReaderIdentifier[] = "adobe-reader";
+#endif
 
 // The prompt delegate used to ask the user if they want to use Adobe Reader
 // by default.
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index cd9f7cf0..9704386 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -95,8 +95,11 @@ const char kMemoryJsPath[] = "memory.js";
 const char kMemoryCssPath[] = "about_memory.css";
 const char kStatsJsPath[] = "stats.js";
 const char kStringsJsPath[] = "strings.js";
+
+#if defined(OS_CHROMEOS)
 // chrome://terms falls back to offline page after kOnlineTermsTimeoutSec.
 const int kOnlineTermsTimeoutSec = 7;
+#endif  // defined(OS_CHROMEOS)
 
 // When you type about:memory, it actually loads this intermediate URL that
 // redirects you to the final page. This avoids the problem where typing
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.cc b/chrome/browser/ui/webui/app_launcher_page_ui.cc
index c1fb8ae..e83c8af 100644
--- a/chrome/browser/ui/webui/app_launcher_page_ui.cc
+++ b/chrome/browser/ui/webui/app_launcher_page_ui.cc
@@ -30,12 +30,6 @@ class ExtensionService;
 
 using content::BrowserThread;
 
-namespace {
-
-const char kUmaPaintTimesLabel[] = "AppLauncherPageUI load";
-
-}  // namespace
-
 ///////////////////////////////////////////////////////////////////////////////
 // AppLauncherPageUI
 
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
index bb1ac1a..520e799 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -54,7 +54,6 @@ const char kKeyTemporary[] = "temporary";
 const char kKeyTotalUsage[] = "totalUsage";
 const char kKeyTemporaryUsage[] = "temporaryUsage";
 const char kKeyPersistentUsage[] = "persistentUsage";
-const char kKeyPersistentQuota[] = "persistentQuota";
 
 const char kKeyCertType[] = "certType";
 
diff --git a/chrome/browser/ui/webui/extensions/extension_error_handler.cc b/chrome/browser/ui/webui/extensions/extension_error_handler.cc
index f89feb4..c537365 100644
--- a/chrome/browser/ui/webui/extensions/extension_error_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_error_handler.cc
@@ -26,17 +26,10 @@
 
 namespace extensions {
 
-namespace {
-
 // Keys for objects passed to and from extension error UI.
-const char kFileTypeKey[] = "fileType";
-const char kManifestFileType[] = "manifest";
 const char kPathSuffixKey[] = "pathSuffix";
-const char kSourceFileType[] = "source";
 const char kTitleKey[] = "title";
 
-}  // namespace
-
 ExtensionErrorHandler::ExtensionErrorHandler(Profile* profile)
     : profile_(profile) {
 }
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index 4461ddb..4a5db1c 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -65,50 +65,47 @@ using content::WorkerServiceObserver;
 
 namespace {
 
-static const char kDataFile[] = "targets-data.json";
-static const char kAdbPages[] = "adb-pages";
-
-static const char kAppTargetType[] = "app";
-static const char kExtensionTargetType[]  = "extension";
-static const char kPageTargetType[]  = "page";
-static const char kWorkerTargetType[]  = "worker";
-static const char kAdbTargetType[]  = "adb_page";
-
-static const char kInitUICommand[]  = "init-ui";
-static const char kInspectCommand[]  = "inspect";
-static const char kActivateCommand[]  = "activate";
-static const char kTerminateCommand[]  = "terminate";
-static const char kReloadCommand[]  = "reload";
-static const char kOpenCommand[]  = "open";
-
-static const char kPortForwardingEnabledCommand[] =
+const char kAppTargetType[] = "app";
+const char kExtensionTargetType[]  = "extension";
+const char kPageTargetType[]  = "page";
+const char kWorkerTargetType[]  = "worker";
+const char kAdbTargetType[]  = "adb_page";
+
+const char kInitUICommand[]  = "init-ui";
+const char kInspectCommand[]  = "inspect";
+const char kActivateCommand[]  = "activate";
+const char kTerminateCommand[]  = "terminate";
+const char kReloadCommand[]  = "reload";
+const char kOpenCommand[]  = "open";
+
+const char kPortForwardingEnabledCommand[] =
     "set-port-forwarding-enabled";
-static const char kPortForwardingConfigCommand[] = "set-port-forwarding-config";
-
-static const char kPortForwardingDefaultPort[] = "8080";
-static const char kPortForwardingDefaultLocation[] = "localhost:8080";
-
-static const char kTargetTypeField[]  = "type";
-static const char kAttachedField[]  = "attached";
-static const char kProcessIdField[]  = "processId";
-static const char kRouteIdField[]  = "routeId";
-static const char kUrlField[]  = "url";
-static const char kNameField[]  = "name";
-static const char kFaviconUrlField[] = "faviconUrl";
-static const char kDescription[] = "description";
-static const char kPidField[]  = "pid";
-static const char kAdbSerialField[] = "adbSerial";
-static const char kAdbModelField[] = "adbModel";
-static const char kAdbBrowserProductField[] = "adbBrowserProduct";
-static const char kAdbBrowserPackageField[] = "adbBrowserPackage";
-static const char kAdbBrowserVersionField[] = "adbBrowserVersion";
-static const char kAdbGlobalIdField[] = "adbGlobalId";
-static const char kAdbBrowsersField[] = "browsers";
-static const char kAdbPagesField[] = "pages";
-static const char kAdbPortStatus[] = "adbPortStatus";
-static const char kAdbScreenWidthField[] = "adbScreenWidth";
-static const char kAdbScreenHeightField[] = "adbScreenHeight";
-static const char kGuestList[] = "guests";
+const char kPortForwardingConfigCommand[] = "set-port-forwarding-config";
+
+const char kPortForwardingDefaultPort[] = "8080";
+const char kPortForwardingDefaultLocation[] = "localhost:8080";
+
+const char kTargetTypeField[]  = "type";
+const char kAttachedField[]  = "attached";
+const char kProcessIdField[]  = "processId";
+const char kRouteIdField[]  = "routeId";
+const char kUrlField[]  = "url";
+const char kNameField[]  = "name";
+const char kFaviconUrlField[] = "faviconUrl";
+const char kDescription[] = "description";
+const char kPidField[]  = "pid";
+const char kAdbSerialField[] = "adbSerial";
+const char kAdbModelField[] = "adbModel";
+const char kAdbBrowserProductField[] = "adbBrowserProduct";
+const char kAdbBrowserPackageField[] = "adbBrowserPackage";
+const char kAdbBrowserVersionField[] = "adbBrowserVersion";
+const char kAdbGlobalIdField[] = "adbGlobalId";
+const char kAdbBrowsersField[] = "browsers";
+const char kAdbPagesField[] = "pages";
+const char kAdbPortStatus[] = "adbPortStatus";
+const char kAdbScreenWidthField[] = "adbScreenWidth";
+const char kAdbScreenHeightField[] = "adbScreenHeight";
+const char kGuestList[] = "guests";
 
 DictionaryValue* BuildTargetDescriptor(
     const std::string& target_type,
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
index 35dee3a..74ab381 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
@@ -33,13 +33,6 @@
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
 
-// Default URL for the sync web interface.
-//
-// TODO(idana): when we figure out how we are going to allow third parties to
-// plug in their own sync engine, we should allow this value to be
-// configurable.
-static const char kSyncDefaultViewOnlineUrl[] = "http://docs.google.com";
-
 NewTabPageSyncHandler::NewTabPageSyncHandler() : sync_service_(NULL),
   waiting_for_initial_page_load_(true) {
 }
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 7594cbf..80d46dc 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -82,14 +82,6 @@ const char kLearnMoreIncognitoUrl[] =
 const char kLearnMoreGuestSessionUrl[] =
     "https://www.google.com/support/chromeos/bin/answer.py?answer=1057090";
 
-// The URL for bookmark sync service help.
-const char kSyncServiceHelpUrl[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=165139";
-
-// The URL to be loaded to display Help.
-const char kHelpContentUrl[] =
-    "https://www.google.com/support/chrome/";
-
 string16 GetUrlWithLang(const GURL& url) {
   return ASCIIToUTF16(google_util::AppendGoogleLocaleParam(url).spec());
 }
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index e0bb785..35b89cb 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -47,14 +47,6 @@ const char kKeyIsOwner[] = "isOwner";
 const char kKeyIsDesktop[] = "isDesktopUser";
 const char kKeyAvatarUrl[] = "userImage";
 const char kKeyNeedsSignin[] = "needsSignin";
-const char kGAIAPictureFileNameKey[] = "gaia_picture_file_name";
-
-// Max number of users to show.
-const size_t kMaxUsers = 18;
-
-// Type of the login screen UI that is currently presented to user.
-const char kSourceGaiaSignin[] = "gaia-signin";
-const char kSourceAccountPicker[] = "account-picker";
 
 // JS API callback names.
 const char kJsApiUserManagerInitialize[] = "userManagerInitialize";
diff --git a/chrome/browser/ui/webui/signin/user_manager_ui.cc b/chrome/browser/ui/webui/signin/user_manager_ui.cc
index 67e8ed5..c26423f 100644
--- a/chrome/browser/ui/webui/signin/user_manager_ui.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_ui.cc
@@ -15,13 +15,9 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/web_ui_util.h"
 
-namespace {
-  // JS file names.
-  const char kStringsJSPath[] = "strings.js";
-  const char kUserManagerJSPath[] = "user_manager.js";
-  const char kHeaderBarJSPath[] = "header_bar.js";
-  const char kAccountPickerJSPath[] = "screen_account_picker.js";
-}
+// JS file names.
+const char kStringsJSPath[] = "strings.js";
+const char kUserManagerJSPath[] = "user_manager.js";
 
 UserManagerUI::UserManagerUI(content::WebUI* web_ui)
   : WebUIController(web_ui) {
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc
index f4b35fe..5963568 100644
--- a/chrome/browser/web_resource/promo_resource_service.cc
+++ b/chrome/browser/web_resource/promo_resource_service.cc
@@ -30,10 +30,6 @@ const int kStartResourceFetchDelay = 5000;
 const int kCacheUpdateDelay = 6 * 60 * 60 * 1000;
 const int kTestCacheUpdateDelay = 3 * 60 * 1000;
 
-// The version of the service (used to expire the cache when upgrading Chrome
-// to versions with different types of promos).
-const int kPromoServiceVersion = 7;
-
 // The promotion type used for Unpack() and ScheduleNotificationOnInit().
 const NotificationPromo::PromoType kValidPromoTypes[] = {
 #if defined(OS_ANDROID) || defined(OS_IOS)
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index f65cb87..b7b23d0 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -73,8 +73,6 @@ const uint32 kNaClPluginPermissions = ppapi::PERMISSION_PRIVATE |
 const char kPnaclPluginMimeType[] = "application/x-pnacl";
 const char kPnaclPluginExtension[] = "";
 const char kPnaclPluginDescription[] = "Portable Native Client Executable";
-const uint32 kPnaclPluginPermissions = ppapi::PERMISSION_PRIVATE |
-                                       ppapi::PERMISSION_DEV;
 
 const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator";
 const char kO3DPluginMimeType[] ="application/vnd.o3d.auto";
diff --git a/chrome/common/extensions/csp_validator.cc b/chrome/common/extensions/csp_validator.cc
index f33e1ac..523d51e 100644
--- a/chrome/common/extensions/csp_validator.cc
+++ b/chrome/common/extensions/csp_validator.cc
@@ -21,7 +21,6 @@ const char kObjectSrc[] = "object-src";
 const char kSandboxDirectiveName[] = "sandbox";
 const char kAllowSameOriginToken[] = "allow-same-origin";
 const char kAllowTopNavigation[] = "allow-top-navigation";
-const char kAllowPopups[] = "allow-popups";
 
 struct DirectiveStatus {
   explicit DirectiveStatus(const char* name)
diff --git a/chrome/common/external_ipc_fuzzer.cc b/chrome/common/external_ipc_fuzzer.cc
index 9e125cc..10416c4 100644
--- a/chrome/common/external_ipc_fuzzer.cc
+++ b/chrome/common/external_ipc_fuzzer.cc
@@ -6,17 +6,16 @@
 
 #if defined(OS_LINUX)
 #include <dlfcn.h>
-#endif
 
 typedef IPC::ChannelProxy::OutgoingMessageFilter *(*GetFuzzerFunction)();
 const char kFuzzLibraryName[] = "libipcfuzz.so";
 const char kFuzzEntryName[] = "GetFilter";
+#endif
 
 IPC::ChannelProxy::OutgoingMessageFilter* LoadExternalIPCFuzzer() {
   IPC::ChannelProxy::OutgoingMessageFilter* result = NULL;
 
 #if defined(OS_LINUX)
-
   // Fuzz is currently linux-only feature
   void *fuzz_library =  dlopen(kFuzzLibraryName, RTLD_NOW);
   if (fuzz_library) {
diff --git a/chrome/common/omaha_query_params/omaha_query_params.cc b/chrome/common/omaha_query_params/omaha_query_params.cc
index f320310..f68c9be 100644
--- a/chrome/common/omaha_query_params/omaha_query_params.cc
+++ b/chrome/common/omaha_query_params/omaha_query_params.cc
@@ -46,14 +46,18 @@ const char kArch[] =
 #endif
 
 const char kChrome[] = "chrome";
-const char kChromeCrx[] = "chromecrx";
-const char kChromiumCrx[] = "chromiumcrx";
 
 const char kStable[] = "stable";
 const char kBeta[] = "beta";
 const char kDev[] = "dev";
 const char kCanary[] = "canary";
 
+#if defined(GOOGLE_CHROME_BUILD)
+const char kChromeCrx[] = "chromecrx";
+#else
+const char kChromiumCrx[] = "chromiumcrx";
+#endif  // defined(GOOGLE_CHROME_BUILD)
+
 }  // namespace
 
 namespace chrome {
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index 173fd04..c12a3ed 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -25,16 +25,18 @@
 
 using content::KeySystemInfo;
 
-static const char kAudioWebM[] = "audio/webm";
-static const char kVideoWebM[] = "video/webm";
-static const char kVorbis[] = "vorbis";
-static const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
-
-static const char kAudioMp4[] = "audio/mp4";
-static const char kVideoMp4[] = "video/mp4";
-static const char kMp4a[] = "mp4a";
-static const char kAvc1[] = "avc1";
-static const char kMp4aAvc1[] = "mp4a,avc1";
+const char kAudioWebM[] = "audio/webm";
+const char kVideoWebM[] = "video/webm";
+const char kVorbis[] = "vorbis";
+const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
+
+#if defined(USE_PROPRIETARY_CODECS)
+const char kAudioMp4[] = "audio/mp4";
+const char kVideoMp4[] = "video/mp4";
+const char kMp4a[] = "mp4a";
+const char kAvc1[] = "avc1";
+const char kMp4aAvc1[] = "mp4a,avc1";
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmRegistered(const std::string& pepper_type) {
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 18c4d4c..1758bd7 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -37,10 +37,6 @@
 
 namespace {
 
-// CUPS specific options.
-const char kCUPSPrinterInfoOpt[] = "printer-info";
-const char kCUPSPrinterStateOpt[] = "printer-state";
-
 // Print system config options.
 const char kCUPSPrintServerURLs[] = "print_server_urls";
 const char kCUPSUpdateTimeoutMs[] = "update_timeout_ms";
@@ -52,9 +48,6 @@ const char kCUPSSupportedMimeTipes[] = "supported_mime_types";
 const char kCUPSDefaultSupportedTypes[] =
     "application/pdf,application/postscript,image/jpeg,image/png,image/gif";
 
-// Default port for IPP print servers.
-const int kDefaultIPPServerPort = 631;
-
 // Time interval to check for printer's updates.
 const int kCheckForPrinterUpdatesMinutes = 5;
 
diff --git a/components/autofill/core/browser/address.cc b/components/autofill/core/browser/address.cc
index e96183c..238cb24 100644
--- a/components/autofill/core/browser/address.cc
+++ b/components/autofill/core/browser/address.cc
@@ -14,12 +14,6 @@
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 
-namespace {
-
-const char16 kAddressSplitChars[] = {'-', ',', '#', '.', ' ', 0};
-
-}  // namespace
-
 namespace autofill {
 
 Address::Address() {}
diff --git a/components/autofill/core/browser/contact_info.cc b/components/autofill/core/browser/contact_info.cc
index b3ef985..9bd91c3 100644
--- a/components/autofill/core/browser/contact_info.cc
+++ b/components/autofill/core/browser/contact_info.cc
@@ -16,15 +16,6 @@
 
 namespace autofill {
 
-static const ServerFieldType kAutofillNameInfoTypes[] = {
-  NAME_FIRST,
-  NAME_MIDDLE,
-  NAME_LAST
-};
-
-static const size_t kAutofillNameInfoLength =
-    arraysize(kAutofillNameInfoTypes);
-
 NameInfo::NameInfo() {}
 
 NameInfo::NameInfo(const NameInfo& info) : FormGroup() {
diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index ae4de04..1ea9913 100644
--- a/components/autofill/core/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -45,7 +45,6 @@ const char kAttributeFieldType[] = "fieldtype";
 const char kAttributeFormSignature[] = "formsignature";
 const char kAttributeName[] = "name";
 const char kAttributeSignature[] = "signature";
-const char kAttributeUrlprefixSignature[] = "urlprefixsignature";
 const char kAcceptedFeaturesExperiment[] = "e"; // e=experiments
 const char kClientVersion[] = "6.1.1715.1442/en (GGLL)";
 const char kXMLDeclaration[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
diff --git a/components/autofill/core/browser/phone_number.cc b/components/autofill/core/browser/phone_number.cc
index b068b03..82889b7 100644
--- a/components/autofill/core/browser/phone_number.cc
+++ b/components/autofill/core/browser/phone_number.cc
@@ -19,12 +19,6 @@ namespace {
 
 const char16 kPhoneNumberSeparators[] = { ' ', '.', '(', ')', '-', 0 };
 
-// The number of digits in a phone number.
-const size_t kPhoneNumberLength = 7;
-
-// The number of digits in an area code.
-const size_t kPhoneCityCodeLength = 3;
-
 void StripPunctuation(base::string16* number) {
   RemoveChars(*number, kPhoneNumberSeparators, number);
 }
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 2e76dc0..b720ae48 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -36,9 +36,12 @@ namespace {
 
 // Key names on BrowserContext.
 const char kDownloadManagerKeyName[] = "download_manager";
-const char kMountPointsKey[] = "mount_points";
 const char kStorageParitionMapKeyName[] = "content_storage_partition_map";
 
+#if defined(OS_CHROMEOS)
+const char kMountPointsKey[] = "mount_points";
+#endif  // defined(OS_CHROMEOS)
+
 StoragePartitionImplMap* GetStoragePartitionMap(
     BrowserContext* browser_context) {
   StoragePartitionImplMap* partition_map =
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index 8003b8b..db30d26 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -52,29 +52,27 @@
 
 namespace content {
 
-const int kBufferSize = 16 * 1024;
-
 namespace {
 
-static const char* kProtocolVersion = "1.0";
+const char kProtocolVersion[] = "1.0";
 
-static const char* kDevToolsHandlerThreadName = "Chrome_DevToolsHandlerThread";
+const char kDevToolsHandlerThreadName[] = "Chrome_DevToolsHandlerThread";
 
-static const char* kThumbUrlPrefix = "/thumb/";
-static const char* kPageUrlPrefix = "/devtools/page/";
+const char kThumbUrlPrefix[] = "/thumb/";
+const char kPageUrlPrefix[] = "/devtools/page/";
 
-static const char* kTargetIdField = "id";
-static const char* kTargetTypeField = "type";
-static const char* kTargetTitleField = "title";
-static const char* kTargetDescriptionField = "description";
-static const char* kTargetUrlField = "url";
-static const char* kTargetThumbnailUrlField = "thumbnailUrl";
-static const char* kTargetFaviconUrlField = "faviconUrl";
-static const char* kTargetWebSocketDebuggerUrlField = "webSocketDebuggerUrl";
-static const char* kTargetDevtoolsFrontendUrlField = "devtoolsFrontendUrl";
+const char kTargetIdField[] = "id";
+const char kTargetTypeField[] = "type";
+const char kTargetTitleField[] = "title";
+const char kTargetDescriptionField[] = "description";
+const char kTargetUrlField[] = "url";
+const char kTargetThumbnailUrlField[] = "thumbnailUrl";
+const char kTargetFaviconUrlField[] = "faviconUrl";
+const char kTargetWebSocketDebuggerUrlField[] = "webSocketDebuggerUrl";
+const char kTargetDevtoolsFrontendUrlField[] = "devtoolsFrontendUrl";
 
-static const char* kTargetTypePage = "page";
-static const char* kTargetTypeOther = "other";
+const char kTargetTypePage[] = "page";
+const char kTargetTypeOther[] = "other";
 
 class DevToolsDefaultBindingHandler
     : public DevToolsHttpHandler::DevToolsAgentHostBinding {
diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc
index ff5d326..9abe341 100644
--- a/content/browser/download/download_item_impl_unittest.cc
+++ b/content/browser/download/download_item_impl_unittest.cc
@@ -30,15 +30,10 @@ using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
-namespace {
-
 const int kDownloadChunkSize = 1000;
 const int kDownloadSpeed = 1000;
-const int kDummyDBHandle = 10;
 const base::FilePath::CharType kDummyPath[] = FILE_PATH_LITERAL("/testpath");
 
-} // namespace
-
 namespace content {
 
 namespace {
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
index 51524d7..8ed59ac 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
@@ -41,7 +41,6 @@ const uint32_t kJoystickUsageNumber = 0x04;
 const uint32_t kGameUsageNumber = 0x05;
 const uint32_t kMultiAxisUsageNumber = 0x08;
 const uint32_t kAxisMinimumUsageNumber = 0x30;
-const uint32_t kAxisMaximumUsageNumber = 0x35;
 
 }  // namespace
 
diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc
index f15141a..94074be 100644
--- a/content/browser/geolocation/network_location_request.cc
+++ b/content/browser/geolocation/network_location_request.cc
@@ -25,15 +25,11 @@
 namespace content {
 namespace {
 
-const size_t kMaxRequestLength = 2048;
-
 const char kAccessTokenString[] = "accessToken";
 const char kLocationString[] = "location";
 const char kLatitudeString[] = "lat";
 const char kLongitudeString[] = "lng";
 const char kAccuracyString[] = "accuracy";
-const char kStatusString[] = "status";
-const char kStatusOKString[] = "OK";
 
 // Local functions
 // Creates the request url to send to the server.
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 0402e98..a44715d 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -128,14 +128,6 @@ const int kUserGestureWindowMs = 3500;
 // use. Arbitrarily chosen.
 const double kMaxRequestsPerProcessRatio = 0.45;
 
-// All possible error codes from the network module. Note that the error codes
-// are all positive (since histograms expect positive sample values).
-const int kAllNetErrorCodes[] = {
-#define NET_ERROR(label, value) -(value),
-#include "net/base/net_error_list.h"
-#undef NET_ERROR
-};
-
 // Aborts a request before an URLRequest has actually been created.
 void AbortRequestBeforeItStarts(ResourceMessageFilter* filter,
                                 IPC::Message* sync_result,
diff --git a/content/browser/power_save_blocker_mac.cc b/content/browser/power_save_blocker_mac.cc
index ec340a1..9b3fe09 100644
--- a/content/browser/power_save_blocker_mac.cc
+++ b/content/browser/power_save_blocker_mac.cc
@@ -22,7 +22,9 @@ namespace {
 // http://www.opensource.apple.com/source/IOKitUser/IOKitUser-514.16.31/pwr_mgt.subproj/IOPMLibPrivate.c .
 struct PowerSaveBlockerLazyInstanceTraits {
   static const bool kRegisterOnExit = false;
+#ifndef NDEBUG
   static const bool kAllowedToAccessOnNonjoinableThread = true;
+#endif
 
   static base::Thread* New(void* instance) {
     base::Thread* thread = new (instance) base::Thread("PowerSaveBlocker");
diff --git a/content/browser/renderer_host/media/desktop_capture_device.cc b/content/browser/renderer_host/media/desktop_capture_device.cc
index 16e69bf..2704a05 100644
--- a/content/browser/renderer_host/media/desktop_capture_device.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device.cc
@@ -24,8 +24,6 @@ namespace content {
 
 namespace {
 
-const int kBytesPerPixel = 4;
-
 webrtc::DesktopRect ComputeLetterboxRect(
     const webrtc::DesktopSize& max_size,
     const webrtc::DesktopSize& source_size) {
diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
index 2b6479e..f1d2712 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
@@ -35,7 +35,6 @@ const int kTestFrameWidth1 = 100;
 const int kTestFrameHeight1 = 100;
 const int kTestFrameWidth2 = 200;
 const int kTestFrameHeight2 = 150;
-const int kBufferSize = kTestFrameWidth2 * kTestFrameHeight2 * 4;
 
 const int kFrameRate = 30;
 
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
index 91feb4d..41fa2b0 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
@@ -101,8 +101,6 @@ namespace {
 
 const int kMinFrameWidth = 2;
 const int kMinFrameHeight = 2;
-const int kMaxFramesInFlight = 2;
-const int kMaxSnapshotsInFlight = 1;
 
 // TODO(nick): Remove this once frame subscription is supported on Aura and
 // Linux.
diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
index 341378d..26270e5 100644
--- a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
+++ b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
@@ -17,13 +17,12 @@ namespace content {
 
 namespace {
 
-static const char FAKE_ORIGIN[] = "http://fake.com";
-static const char FAKE_IDENTITY_NAME[] = "fake identity";
-static const char FAKE_COMMON_NAME[] = "fake common name";
-static const char FAKE_CERTIFICATE[] = "fake cert";
-static const char FAKE_PRIVATE_KEY[] = "fake private key";
-static const int FAKE_ERROR = 100;
-static const int FAKE_RENDERER_ID = 10;
+const char FAKE_ORIGIN[] = "http://fake.com";
+const char FAKE_IDENTITY_NAME[] = "fake identity";
+const char FAKE_COMMON_NAME[] = "fake common name";
+const char FAKE_CERTIFICATE[] = "fake cert";
+const char FAKE_PRIVATE_KEY[] = "fake private key";
+const int FAKE_RENDERER_ID = 10;
 
 class MockWebRTCIdentityStore : public WebRTCIdentityStore {
  public:
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index e908cbe..c0d91be 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -189,9 +189,6 @@ static float ScaleFactor(NSView* view) {
 - (void)updateTabBackingStoreScaleFactor;
 @end
 
-// NSEvent subtype for scroll gestures events.
-static const short kIOHIDEventTypeScroll = 6;
-
 // A window subclass that allows the fullscreen window to become main and gain
 // keyboard focus. This is only used for pepper flash. Normal fullscreen is
 // handled by the browser.
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index d61c70b..415b538 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -32,8 +32,6 @@
 namespace content {
 namespace {
 
-const char kSameAsAnyInstanceURL[] = "about:internets";
-
 const char kPrivilegedScheme[] = "privileged";
 
 class SiteInstanceTestWebUIControllerFactory : public WebUIControllerFactory {
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9c42e7c..02e8f3c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -151,12 +151,6 @@
 namespace content {
 namespace {
 
-// Amount of time we wait between when a key event is received and the renderer
-// is queried for its state and pushed to the NavigationEntry.
-const int kQueryStateDelay = 5000;
-
-const int kSyncWaitDelay = 40;
-
 const char kDotGoogleDotCom[] = ".google.com";
 
 base::LazyInstance<std::vector<WebContents::CreatedCallback> >
diff --git a/content/common/browser_plugin/browser_plugin_constants.cc b/content/common/browser_plugin/browser_plugin_constants.cc
index 6da58e9..d936b3d 100644
--- a/content/common/browser_plugin/browser_plugin_constants.cc
+++ b/content/common/browser_plugin/browser_plugin_constants.cc
@@ -42,9 +42,6 @@ const char kAttributeName[] = "name";
 const char kAttributePartition[] = "partition";
 const char kAttributeSrc[] = "src";
 
-// Events.
-const char kEventSizeChanged[] = "sizechanged";
-
 // Parameters/properties on events.
 const char kDefaultPromptText[] = "defaultPromptText";
 const char kId[] = "id";
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 3158619..e5962db 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -34,8 +34,6 @@
 #include "ui/base/keycodes/keycode_converter.h"
 #include "ui/base/resource/resource_bundle.h"
 
-static const int kDefaultWsPort = 8880;
-
 namespace content {
 namespace {
 
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 0478645..5964d55f 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc
@@ -323,10 +323,6 @@ bool GetSwitchValueAsInt(const std::string& switch_name, int* result) {
 
 }  // namespace
 
-// The following is kept for historical reasons (so people that are used to
-// using it don't get surprised).
-const char kChildProcessFlag[]   = "child";
-
 const char kHelpFlag[]   = "help";
 
 const char kLaunchAsBrowser[] = "as-browser";
diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc
index 4ce6122..5b63971 100644
--- a/content/renderer/media/crypto/key_systems.cc
+++ b/content/renderer/media/crypto/key_systems.cc
@@ -25,18 +25,19 @@ static std::string ToASCIIOrEmpty(const WebKit::WebString& string) {
   return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
 }
 
-static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
-
-static const char kAudioWebM[] = "audio/webm";
-static const char kVideoWebM[] = "video/webm";
-static const char kVorbis[] = "vorbis";
-static const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
-
-static const char kAudioMp4[] = "audio/mp4";
-static const char kVideoMp4[] = "video/mp4";
-static const char kMp4a[] = "mp4a";
-static const char kAvc1[] = "avc1";
-static const char kMp4aAvc1[] = "mp4a,avc1";
+const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
+
+const char kAudioWebM[] = "audio/webm";
+const char kVideoWebM[] = "video/webm";
+const char kVorbis[] = "vorbis";
+const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
+
+#if defined(USE_PROPRIETARY_CODECS)
+const char kAudioMp4[] = "audio/mp4";
+const char kVideoMp4[] = "video/mp4";
+const char kMp4a[] = "mp4a";
+const char kMp4aAvc1[] = "mp4a,avc1";
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) {
   KeySystemInfo info(kClearKeyKeySystem);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6827468..2b2b03b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -363,19 +363,17 @@ static base::LazyInstance<RoutingIDViewMap> g_routing_id_view_map =
 // foreground renderer. This means there is a small window of time from which
 // content state is modified and not sent to session restore, but this is
 // better than having to wake up all renderers during shutdown.
-static const int kDelaySecondsForContentStateSyncHidden = 5;
-static const int kDelaySecondsForContentStateSync = 1;
+const int kDelaySecondsForContentStateSyncHidden = 5;
+const int kDelaySecondsForContentStateSync = 1;
 
-static const size_t kExtraCharsBeforeAndAfterSelection = 100;
+const size_t kExtraCharsBeforeAndAfterSelection = 100;
 
-static const float kScalingIncrement = 0.1f;
-
-static const float kScalingIncrementForGesture = 0.01f;
+const float kScalingIncrementForGesture = 0.01f;
 
 #if defined(OS_ANDROID)
 // Delay between tapping in content and launching the associated android intent.
 // Used to allow users see what has been recognized as content.
-static const size_t kContentIntentDelayMilliseconds = 700;
+const size_t kContentIntentDelayMilliseconds = 700;
 #endif
 
 static RenderViewImpl* (*g_create_render_view_impl)(RenderViewImplParams*) =
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index 751268e..40206b2 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -48,9 +48,6 @@ namespace content {
 
 namespace {
 
-// See third_party/WebKit/Source/WebCore/dom/WheelEvent.h.
-const float kTickDivisor = 120.0f;
-
 class FullscreenMouseLockDispatcher : public MouseLockDispatcher {
  public:
   explicit FullscreenMouseLockDispatcher(RenderWidgetFullscreenPepper* widget);
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 7ab1d23..e9b5938 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -11,7 +11,6 @@ namespace manifest_keys {
 const char kAllFrames[] = "all_frames";
 const char kAltKey[] = "altKey";
 const char kApp[] = "app";
-const char kAudio[] = "audio";
 const char kBackgroundAllowJsAccess[] = "background.allow_js_access";
 const char kBackgroundPage[] = "background.page";
 const char kBackgroundPageLegacy[] = "background_page";
@@ -121,7 +120,6 @@ const char kSpellcheckDictionaryPath[] = "dictionary_path";
 const char kStorageManagedSchema[] = "storage.managed_schema";
 const char kSuggestedKey[] = "suggested_key";
 const char kSystemIndicator[] = "system_indicator";
-const char kSystemInfoDisplay[] = "systemInfo.display";
 const char kTheme[] = "theme";
 const char kThemeColors[] = "colors";
 const char kThemeDisplayProperties[] = "properties";
@@ -469,8 +467,6 @@ const char kInvalidOptionsPageExpectUrlInPackage[] =
 const char kInvalidOptionsPageInHostedApp[] =
     "Invalid value for 'options_page'. Hosted apps must specify an "
     "absolute URL.";
-const char kInvalidOptionalPermissions[] =
-    "Invalid value for 'optional_permissions'.";
 const char kInvalidPageAction[] =
     "Invalid value for 'page_action'.";
 const char kInvalidPageActionDefaultTitle[] =
diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index e5e5b8f..43e4bf9 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -40,7 +40,6 @@ const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth";
 const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth";
 const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke";
 const char kOAuth2TokenUrlSuffix[] = "o/oauth2/token";
-const char kClientOAuthUrlSuffix[] = "ClientOAuth";
 
 // API calls from www.googleapis.com
 const char kOAuth2IssueTokenUrlSuffix[] = "oauth2/v2/IssueToken";
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc
index b705ab8..b3641eb 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow.cc
@@ -30,29 +30,28 @@ using net::URLRequestStatus;
 
 namespace {
 
-static const char kForceValueFalse[] = "false";
-static const char kForceValueTrue[] = "true";
-static const char kResponseTypeValueNone[] = "none";
-static const char kResponseTypeValueToken[] = "token";
+const char kForceValueFalse[] = "false";
+const char kForceValueTrue[] = "true";
+const char kResponseTypeValueNone[] = "none";
+const char kResponseTypeValueToken[] = "token";
 
-static const char kOAuth2IssueTokenBodyFormat[] =
+const char kOAuth2IssueTokenBodyFormat[] =
     "force=%s"
     "&response_type=%s"
     "&scope=%s"
     "&client_id=%s"
     "&origin=%s";
-static const char kIssueAdviceKey[] = "issueAdvice";
-static const char kIssueAdviceValueAuto[] = "auto";
-static const char kIssueAdviceValueConsent[] = "consent";
-static const char kAccessTokenKey[] = "token";
-static const char kConsentKey[] = "consent";
-static const char kExpiresInKey[] = "expiresIn";
-static const char kScopesKey[] = "scopes";
-static const char kDescriptionKey[] = "description";
-static const char kDetailKey[] = "detail";
-static const char kDetailSeparators[] = "\n";
-static const char kError[] = "error";
-static const char kMessage[] = "message";
+const char kIssueAdviceKey[] = "issueAdvice";
+const char kIssueAdviceValueConsent[] = "consent";
+const char kAccessTokenKey[] = "token";
+const char kConsentKey[] = "consent";
+const char kExpiresInKey[] = "expiresIn";
+const char kScopesKey[] = "scopes";
+const char kDescriptionKey[] = "description";
+const char kDetailKey[] = "detail";
+const char kDetailSeparators[] = "\n";
+const char kError[] = "error";
+const char kMessage[] = "message";
 
 static GoogleServiceAuthError CreateAuthError(const net::URLFetcher* source) {
   URLRequestStatus status = source->GetStatus();
diff --git a/google_apis/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc
index b16744c..fe65d4f 100644
--- a/google_apis/gaia/oauth_request_signer.cc
+++ b/google_apis/gaia/oauth_request_signer.cc
@@ -24,26 +24,24 @@
 
 namespace {
 
-static const int kHexBase = 16;
-static char kHexDigits[] = "0123456789ABCDEF";
-static const size_t kHmacDigestLength = 20;
-static const int kMaxNonceLength = 30;
-static const int kMinNonceLength = 15;
+const int kHexBase = 16;
+char kHexDigits[] = "0123456789ABCDEF";
+const size_t kHmacDigestLength = 20;
+const int kMaxNonceLength = 30;
+const int kMinNonceLength = 15;
 
-static const char kOAuthConsumerKeyLabel[] = "oauth_consumer_key";
-static const char kOAuthConsumerSecretLabel[] = "oauth_consumer_secret";
-static const char kOAuthNonceCharacters[] =
+const char kOAuthConsumerKeyLabel[] = "oauth_consumer_key";
+const char kOAuthNonceCharacters[] =
     "abcdefghijklmnopqrstuvwyz"
     "ABCDEFGHIJKLMNOPQRSTUVWYZ"
     "0123456789_";
-static const char kOAuthNonceLabel[] = "oauth_nonce";
-static const char kOAuthSignatureLabel[] = "oauth_signature";
-static const char kOAuthSignatureMethodLabel[] = "oauth_signature_method";
-static const char kOAuthTimestampLabel[] = "oauth_timestamp";
-static const char kOAuthTokenLabel[] = "oauth_token";
-static const char kOAuthTokenSecretLabel[] = "oauth_token_secret";
-static const char kOAuthVersion[] = "1.0";
-static const char kOAuthVersionLabel[] = "oauth_version";
+const char kOAuthNonceLabel[] = "oauth_nonce";
+const char kOAuthSignatureLabel[] = "oauth_signature";
+const char kOAuthSignatureMethodLabel[] = "oauth_signature_method";
+const char kOAuthTimestampLabel[] = "oauth_timestamp";
+const char kOAuthTokenLabel[] = "oauth_token";
+const char kOAuthVersion[] = "1.0";
+const char kOAuthVersionLabel[] = "oauth_version";
 
 enum ParseQueryState {
   START_STATE,
diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index cc863908..a40e989 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -22,10 +22,11 @@ using ::base::SharedMemory;
 
 namespace gpu {
 
-namespace {
-const int64 kRescheduleTimeOutDelay = 1000;
 const int64 kUnscheduleFenceTimeOutDelay = 10000;
-}
+
+#if defined(OS_WIN)
+const int64 kRescheduleTimeOutDelay = 1000;
+#endif
 
 GpuScheduler::GpuScheduler(CommandBuffer* command_buffer,
                            AsyncAPIInterface* handler,
diff --git a/jingle/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc
index 6c50862..1a877e1 100644
--- a/jingle/notifier/communicator/login.cc
+++ b/jingle/notifier/communicator/login.cc
@@ -24,9 +24,6 @@
 
 namespace notifier {
 
-// Redirect valid for 5 minutes.
-static const int kRedirectTimeoutMinutes = 5;
-
 Login::Delegate::~Delegate() {}
 
 Login::Login(Delegate* delegate,
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index d97f453..9b0c9b21 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -15,8 +15,6 @@
 
 namespace media {
 
-static const int kMinIntervalBetweenVolumeUpdatesMs = 1000;
-
 static std::ostream& operator<<(std::ostream& os,
                                 const AudioStreamBasicDescription& format) {
   os << "sample rate       : " << format.mSampleRate << std::endl
diff --git a/media/mp3/mp3_stream_parser.cc b/media/mp3/mp3_stream_parser.cc
index f577708..5d2f8c1 100644
--- a/media/mp3/mp3_stream_parser.cc
+++ b/media/mp3/mp3_stream_parser.cc
@@ -96,7 +96,6 @@ static const int kSampleRateMap[4][4] = {
 };
 
 // Frame header field constants.
-static const int kVersion1 = 3;
 static const int kVersion2 = 2;
 static const int kVersionReserved = 1;
 static const int kVersion2_5 = 0;
diff --git a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
index 3f5ab0d..99e0339 100644
--- a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
+++ b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc
@@ -5,13 +5,14 @@
 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
 #include "ppapi/native_client/src/trusted/plugin/nexe_arch.h"
 
-namespace {
 // The list of supported ISA strings for x86.  See issue:
 //   http://code.google.com/p/nativeclient/issues/detail?id=1040 for more
 // information.  Note that these string are to be case-insensitive compared.
-const char* const kNexeArchX86_32 = "x86-32";
-const char* const kNexeArchX86_64 = "x86-64";
-}  // namespace
+const char kNexeArchX86_64[] = "x86-64";
+#if !((NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \
+    (defined(NACL_LINUX) || defined(NACL_OSX)))
+const char kNexeArchX86_32[] = "x86-32";
+#endif
 
 namespace plugin {
 const char* GetSandboxISA() {
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc
index 29dc1fd..9b86e5d 100644
--- a/printing/backend/print_backend.cc
+++ b/printing/backend/print_backend.cc
@@ -9,13 +9,8 @@
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "ui/gfx/text_elider.h"
 
-namespace {
-
-const wchar_t kDefaultDocumentTitle[] = L"Untitled Document";
 const int kMaxDocumentTitleLength = 50;
 
-}  // namespace
-
 namespace printing {
 
 PrinterBasicInfo::PrinterBasicInfo()
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
index 47ebab3..e0d0b40 100644
--- a/remoting/client/plugin/pepper_port_allocator.cc
+++ b/remoting/client/plugin/pepper_port_allocator.cc
@@ -22,9 +22,6 @@ namespace remoting {
 
 namespace {
 
-// URL used to create a relay session.
-const char kCreateRelaySessionURL[] = "/create_session";
-
 // Read buffer we allocate per read when reading response from
 // URLLoader. Normally the response from URL loader is smaller than 1kB.
 const int kReadSize = 1024;
diff --git a/remoting/codec/audio_encoder_opus.cc b/remoting/codec/audio_encoder_opus.cc
index 51b66f0..53bfe0b 100644
--- a/remoting/codec/audio_encoder_opus.cc
+++ b/remoting/codec/audio_encoder_opus.cc
@@ -18,12 +18,6 @@ namespace {
 // Output 160 kb/s bitrate.
 const int kOutputBitrateBps = 160 * 1024;
 
-// Encoded buffer size.
-const int kFrameDefaultBufferSize = 4096;
-
-// Maximum buffer size we'll allocate when encoding before giving up.
-const int kMaxBufferSize = 65536;
-
 // Opus doesn't support 44100 sampling rate so we always resample to 48kHz.
 const AudioPacket::SamplingRate kOpusSamplingRate =
     AudioPacket::SAMPLING_RATE_48000;
diff --git a/remoting/codec/video_encoder_verbatim.cc b/remoting/codec/video_encoder_verbatim.cc
index 424221b..0133b3f 100644
--- a/remoting/codec/video_encoder_verbatim.cc
+++ b/remoting/codec/video_encoder_verbatim.cc
@@ -13,8 +13,6 @@
 
 namespace remoting {
 
-static const int kPacketSize = 1024 * 1024;
-
 VideoEncoderVerbatim::VideoEncoderVerbatim() {}
 VideoEncoderVerbatim::~VideoEncoderVerbatim() {}
 
diff --git a/sync/sessions/sync_session_context.cc b/sync/sessions/sync_session_context.cc
index 98ab5f0..bf1da3a 100644
--- a/sync/sessions/sync_session_context.cc
+++ b/sync/sessions/sync_session_context.cc
@@ -10,9 +10,6 @@
 namespace syncer {
 namespace sessions {
 
-const unsigned int kMaxMessagesToRecord = 10;
-const unsigned int kMaxMessageSizeToRecord = 5 * 1024;
-
 SyncSessionContext::SyncSessionContext(
     ServerConnectionManager* connection_manager,
     syncable::Directory* directory,
diff --git a/ui/app_list/cocoa/blue_label_button.mm b/ui/app_list/cocoa/blue_label_button.mm
index 24de2ae..fc51db0 100644
--- a/ui/app_list/cocoa/blue_label_button.mm
+++ b/ui/app_list/cocoa/blue_label_button.mm
@@ -10,8 +10,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
-namespace {
-
 const CGFloat kCornerRadius = 2;
 
 const CGFloat kButtonFontSizeDelta = -1;
@@ -27,13 +25,10 @@ const SkColor kPressedColor = SkColorSetRGB(0x42, 0x79, 0xd8);
 const SkColor kInnerRingColor = SkColorSetRGB(0x64, 0x9e, 0xff);
 const SkColor kFocusInnerRingColor = SkColorSetRGB(0xad, 0xcc, 0xff);
 const SkColor kPressInnerRingColor = SkColorSetRGB(0x3f, 0x73, 0xcd);
-const SkColor kPressFocusInnerRingColor = SkColorSetRGB(0xa0, 0xb9, 0xe7);
 
 const SkColor kOuterRingColor = SkColorSetRGB(0x2b, 0x67, 0xce);
 const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2);
 
-}  // namespace
-
 @interface BlueLabelButtonCell : NSButtonCell
 
 + (NSAttributedString*)generateAttributedString:(NSString*)buttonText;
diff --git a/ui/app_list/cocoa/item_drag_controller.mm b/ui/app_list/cocoa/item_drag_controller.mm
index a4413c0..1de425b 100644
--- a/ui/app_list/cocoa/item_drag_controller.mm
+++ b/ui/app_list/cocoa/item_drag_controller.mm
@@ -8,17 +8,13 @@
 #import "ui/app_list/cocoa/apps_grid_view_item.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
-namespace {
-
 // Scale to transform the grid cell when a drag starts. Note that 1.5 ensures
 // that integers are used for the layer bounds when the grid cell dimensions
 // are even.
 const CGFloat kDraggingIconScale = 1.5;
 
 const NSTimeInterval kAnimationDuration = 0.2;
-NSString* const kGrowAnimationKey = @"growAnimation";
 
-}  // namespace
 
 @interface ItemDragController ()
 
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 61517f3..1e7e406 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -64,7 +64,6 @@ const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f,
                                     2.0f};
 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
                kScaleFactorScales_incorrect_size);
-const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
 
 }  // namespace
 
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 52cb834..d482407 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -34,11 +34,13 @@ namespace {
 // Various weak, LTR, RTL, and Bidi string cases with three characters each.
 const wchar_t kWeak[] =      L" . ";
 const wchar_t kLtr[] =       L"abc";
+const wchar_t kRtl[] =       L"\x5d0\x5d1\x5d2";
+#if !defined(OS_MACOSX)
 const wchar_t kLtrRtl[] =    L"a" L"\x5d0\x5d1";
 const wchar_t kLtrRtlLtr[] = L"a" L"\x5d1" L"b";
-const wchar_t kRtl[] =       L"\x5d0\x5d1\x5d2";
 const wchar_t kRtlLtr[] =    L"\x5d0\x5d1" L"a";
 const wchar_t kRtlLtrRtl[] = L"\x5d0" L"a" L"\x5d1";
+#endif
 
 // Checks whether |range| contains |index|. This is not the same as calling
 // |range.Contains(gfx::Range(index))| - as that would return true when
diff --git a/ui/gl/vsync_provider.cc b/ui/gl/vsync_provider.cc
index 064eb94..0f6fa5b 100644
--- a/ui/gl/vsync_provider.cc
+++ b/ui/gl/vsync_provider.cc
@@ -9,8 +9,7 @@
 #include "base/logging.h"
 #include "base/time/time.h"
 
-namespace {
-
+#if defined(OS_LINUX)
 // These constants define a reasonable range for a calculated refresh interval.
 // Calculating refreshes out of this range will be considered a fatal error.
 const int64 kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
@@ -20,8 +19,7 @@ const int64 kMaxVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 10;
 // we think the latest computed interval is invalid (noisey due to
 // monitor configuration change, moving a window between monitors, etc.).
 const double kRelativeIntervalDifferenceThreshold = 0.05;
-
-}  // namespace
+#endif
 
 namespace gfx {
 
diff --git a/ui/message_center/cocoa/status_item_view.mm b/ui/message_center/cocoa/status_item_view.mm
index 6c4109b..7a8f4c2 100644
--- a/ui/message_center/cocoa/status_item_view.mm
+++ b/ui/message_center/cocoa/status_item_view.mm
@@ -10,8 +10,6 @@
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-namespace {
-
 // The width of the status bar item when it's just the icon.
 const CGFloat kStatusItemLength = 26;
 
@@ -19,20 +17,12 @@ const CGFloat kStatusItemLength = 26;
 // status item.
 const CGFloat kMargin = 5;
 
-// The amount of space between the icon and the unread count number.
-const CGFloat kUnreadCountPadding = 3;
-
-// The lower-left Y coordinate of the unread count number.
-const CGFloat kUnreadCountMinY = 4;
-
-}  // namespace
 
 @interface MCStatusItemView (Private)
 // Whether or not the status item should be drawn highlighted.
 - (BOOL)shouldHighlight;
 
 - (int)getTrayResourceId;
-
 @end
 
 @implementation MCStatusItemView
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
index 43bc222..3b2bdd2 100644
--- a/ui/native_theme/native_theme_base.cc
+++ b/ui/native_theme/native_theme_base.cc
@@ -67,8 +67,6 @@ const SkColor kCheckboxStrokeDisabledColor = SkColorSetARGB(0x59, 0, 0, 0);
 const SkColor kRadioDotColor = SkColorSetRGB(0x66, 0x66, 0x66);
 const SkColor kRadioDotDisabledColor = SkColorSetARGB(0x80, 0x66, 0x66, 0x66);
 
-const SkColor kInputInvalidColor = SkColorSetRGB(0xde, 0x49, 0x32);
-
 // Get lightness adjusted color.
 SkColor BrightenColor(const color_utils::HSL& hsl, SkAlpha alpha,
     double lightness_amount) {
diff --git a/webkit/browser/fileapi/file_system_context_unittest.cc b/webkit/browser/fileapi/file_system_context_unittest.cc
index 92256af..9b567d6 100644
--- a/webkit/browser/fileapi/file_system_context_unittest.cc
+++ b/webkit/browser/fileapi/file_system_context_unittest.cc
@@ -28,7 +28,6 @@ namespace fileapi {
 namespace {
 
 const char kTestOrigin[] = "http://chromium.org/";
-const base::FilePath::CharType kVirtualPathNoRoot[] = FPL("root/file");
 
 GURL CreateRawFileSystemURL(const std::string& type_str,
                             const std::string& fs_id) {