Move EmptyString, kWhitespace and the BOM to base.

chrome/browser/metrics/metrics_log.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 794 matching lines @@
     // For the remaining calls, re-use the existing field.
     profile = uma_proto()->mutable_profiler_event(0);
   }
 
   WriteProfilerData(process_data, process_type, profile);
 }
 
 void MetricsLog::RecordOmniboxOpenedURL(const OmniboxLog& log) {
   DCHECK(!locked());
 
-  std::vector<string16> terms;
+  std::vector<base::string16> terms;
   const int num_terms =
-      static_cast<int>(Tokenize(log.text, kWhitespaceUTF16, &terms));
+      static_cast<int>(Tokenize(log.text, base::kWhitespaceUTF16, &terms));
 
   OmniboxEventProto* omnibox_event = uma_proto()->add_omnibox_event();
   omnibox_event->set_time(MetricsLogBase::GetCurrentTime());
   if (log.tab_id != -1) {
     // If we know what tab the autocomplete URL was opened in, log it.
     omnibox_event->set_tab_id(log.tab_id);
   }
   omnibox_event->set_typed_length(log.text.length());
   omnibox_event->set_just_deleted_text(log.just_deleted_text);
   omnibox_event->set_num_typed_terms(num_terms);
@@ skipping 119 matching lines @@
 
     // We invalidate the user count if it changed while the log was open.
     if (system_profile->has_multi_profile_user_count() &&
         user_count != system_profile->multi_profile_user_count())
       user_count = 0;
 
     system_profile->set_multi_profile_user_count(user_count);
   }
 }
 #endif