Misc cleanups in Drive code.

chrome/browser/chromeos/drive/search_metadata.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_SEARCH_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_SEARCH_METADATA_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"

[hashimoto, 2013/02/08 11:42:21]

This include can be replaced with following includes:
#include "base/callback_forward.h"
#include "base/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/drive_file_error.h"

[kinaba, 2013/02/12 03:38:07]

We also need fwd declaration of DriveFileSystemInterface and to move the
#include to .cc.
Let me keep this one as is for now, to keep it simpler.

 
 namespace drive {
 
 // Struct to represent a search result for SearchMetadata().
 struct MetadataSearchResult {
   MetadataSearchResult(const FilePath& in_path,
                        const DriveEntryProto& in_entry_proto,
                        const std::string& in_highlighted_base_name)
       : path(in_path),
         entry_proto(in_entry_proto),
         highlighted_base_name(in_highlighted_base_name) {
   }
 
   // The two members are used to create FileEntry object.
   FilePath path;
   DriveEntryProto entry_proto;
 
   // The base name to be displayed in the UI. The parts matched the search
-  // query are highlited with <b> tag. Meta characters are escaped like &lt;
+  // query are highlighted with <b> tag. Meta characters are escaped like &lt;
   //
   // Why HTML? we could instead provide matched ranges using pairs of
   // integers, but this is fragile as we'll eventually converting strings
   // from UTF-8 (StringValue in base/values.h uses std::string) to UTF-16
   // when sending strings from C++ to JavaSCript.
   //
   // Why <b> instead of <strong>? Because <b> is shorter.
   std::string highlighted_base_name;
 };
 
@@ skipping 19 matching lines @@
 // will have the original text with matched portions highlighted with <b> tag
 // (multiple portions can be highlighted). Meta characters are escaped like
 // &lt;. The original contents of |highlighted| will be lost.
 bool FindAndHighlight(const std::string& text,
                       const std::string& query,
                       std::string* highlighted_text);
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_SEARCH_METADATA_H_