Moved DOMActionType information from extras into a real field (ActivityLog)

chrome/browser/extensions/activity_log/dom_actions.cc

 // 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.
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/activity_log/dom_actions.h"
 #include "chrome/browser/history/url_database.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 const char* DOMAction::kTableName = "activitylog_urls";
 const char* DOMAction::kTableContentFields[] =
     {"url_action_type", "url", "url_title", "api_call", "args", "extra"};
 const char* DOMAction::kTableFieldTypes[] =
     {"INTEGER", "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR",
     "LONGVARCHAR"};
 
 DOMAction::DOMAction(const std::string& extension_id,
                      const base::Time& time,
-                     const DOMActionType verb,
+                     const DomActionType::Type verb,
                      const GURL& url,
                      const string16& url_title,
                      const std::string& api_call,
                      const std::string& args,
                      const std::string& extra)
     : Action(extension_id, time),
       verb_(verb),
       url_(url),
       url_title_(url_title),
       api_call_(api_call),
       args_(args),
       extra_(extra) { }
 
 DOMAction::DOMAction(const sql::Statement& s)
     : Action(s.ColumnString(0),
           base::Time::FromInternalValue(s.ColumnInt64(1))),
-      verb_(static_cast<DOMActionType>(s.ColumnInt(2))),
+      verb_(static_cast<DomActionType::Type>(s.ColumnInt(2))),
       url_(GURL(s.ColumnString(3))),
       url_title_(s.ColumnString16(4)),
       api_call_(s.ColumnString(5)),
       args_(s.ColumnString(6)),
       extra_(s.ColumnString(7)) { }
 
 DOMAction::~DOMAction() {
 }
 
 // static
@@ skipping 40 matching lines @@
   statement.BindString(3, history::URLDatabase::GURLToDatabaseURL(url_));
   statement.BindString16(4, url_title_);
   statement.BindString(5, api_call_);
   statement.BindString(6, args_);
   statement.BindString(7, extra_);
   if (!statement.Run())
     LOG(ERROR) << "Activity log database I/O failed: " << sql_str;
 }
 
 std::string DOMAction::PrintForDebug() {
-  if (verb_ == INSERTED)
+  if (verb_ == DomActionType::INSERTED)
     return "Injected scripts (" + args_ + ") onto "
         + std::string(url_.spec());
   else
     return "DOM API CALL: " + api_call_ + ", ARGS: " + args_ + ", VERB: "
         + VerbAsString();
 }
 
 std::string DOMAction::VerbAsString() const {
   switch (verb_) {
-    case GETTER:
+    case DomActionType::GETTER:
       return "GETTER";
-    case SETTER:
+    case DomActionType::SETTER:
       return "SETTER";
-    case METHOD:
+    case DomActionType::METHOD:
       return "METHOD";
-    case INSERTED:
+    case DomActionType::INSERTED:
       return "INSERTED";
-    case XHR:
+    case DomActionType::XHR:
       return "XHR";
-    case WEBREQUEST:
+    case DomActionType::WEBREQUEST:
       return "WEBREQUEST";
-    case MODIFIED:    // legacy
+    case DomActionType::MODIFIED:    // legacy
       return "MODIFIED";
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace extensions