Close FileOutputStream in finally block in WebAppAuthenticator class method.

chrome/android/java/src/org/chromium/chrome/browser/WebappAuthenticator.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
@@ skipping 97 matching lines @@
                 return null;
             }
         } catch (Exception e) {
             Log.w(TAG, "Could not read key from '" + file + "': " + e);
             return null;
         } finally {
             try {
                 if (input != null) {
                     input.close();
                 }
-            } catch (Exception e) {
+            } catch (IOException e) {
                 Log.e(TAG, "Could not close key input stream '" + file + "': " + e);
             }
         }
     }
 
     private static boolean writeKeyToFile(Context context, String basename, SecretKey key) {
         File file = context.getFileStreamPath(basename);
         byte[] keyBytes = key.getEncoded();
+        FileOutputStream output = null;
         if (MAC_KEY_BYTE_COUNT != keyBytes.length) {
             Log.e(TAG, "writeKeyToFile got key encoded bytes length " + keyBytes.length +
                        "; expected " + MAC_KEY_BYTE_COUNT);
             return false;
         }
 
         try {
-            FileOutputStream output = new FileOutputStream(file);
+            output = new FileOutputStream(file);
             output.write(keyBytes);
-            output.close();
             return true;
         } catch (Exception e) {
             Log.e(TAG, "Could not write key to '" + file + "': " + e);
             return false;
+        } finally {
+            try {
+                if (output != null) {
+                    output.close();
+                }
+            } catch (IOException e) {
+                Log.e(TAG, "Could not close key output stream '" + file + "': " + e);
+            }
         }
     }
 
     private static SecretKey getKey(Context context) {
         synchronized (sLock) {
             if (sKey == null) {
                 SecretKey key = readKeyFromFile(context, MAC_KEY_BASENAME, MAC_ALGORITHM_NAME);
                 if (key != null) {
                     sKey = key;
                     return sKey;
@@ skipping 91 matching lines @@
             }
             Mac mac = Mac.getInstance(MAC_ALGORITHM_NAME);
             mac.init(key);
             return mac;
         } catch (GeneralSecurityException e) {
             Log.w(TAG, "Error in creating MAC instance", e);
             return null;
         }
     }
 }