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

chrome/browser/extensions/activity_log/activity_database_unittest.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 <string>
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/activity_log/activity_database.h"
 #include "chrome/browser/extensions/activity_log/api_actions.h"
 #include "chrome/browser/extensions/activity_log/blocked_actions.h"
 #include "chrome/browser/extensions/activity_log/dom_actions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/dom_action_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ skipping 162 matching lines @@
   scoped_refptr<APIAction> api_action = new APIAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromMinutes(40),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   scoped_refptr<DOMAction> dom_action = new DOMAction(
       "punky",
       mock_clock.Now(),
-      DOMAction::MODIFIED,
+      DomActionType::MODIFIED,
       GURL("http://www.google.com"),
       string16(),
       "lets",
       "vamoose",
       "extra");
   scoped_refptr<DOMAction> extra_dom_action = new DOMAction(
       "scoobydoo",
       mock_clock.Now(),
-      DOMAction::MODIFIED,
+      DomActionType::MODIFIED,
       GURL("http://www.google.com"),
       string16(),
       "lets",
       "vamoose",
       "extra");
   activity_db->RecordAction(api_action);
   activity_db->RecordAction(dom_action);
   activity_db->RecordAction(extra_dom_action);
 
   // Read them back
@@ skipping 31 matching lines @@
       "punky",
       mock_clock.Now() - base::TimeDelta::FromDays(3)
           - base::TimeDelta::FromMinutes(40),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   scoped_refptr<DOMAction> dom_action = new DOMAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromDays(3),
-      DOMAction::MODIFIED,
+      DomActionType::MODIFIED,
       GURL("http://www.google.com"),
       string16(),
       "lets",
       "vamoose",
       "extra");
   scoped_refptr<DOMAction> toonew_dom_action = new DOMAction(
       "punky",
       mock_clock.Now(),
-      DOMAction::MODIFIED,
+      DomActionType::MODIFIED,
       GURL("http://www.google.com"),
       string16(),
       "too new",
       "vamoose",
       "extra");
   scoped_refptr<DOMAction> tooold_dom_action = new DOMAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromDays(7),
-      DOMAction::MODIFIED,
+      DomActionType::MODIFIED,
       GURL("http://www.google.com"),
       string16(),
       "too old",
       "vamoose",
       "extra");
   activity_db->RecordAction(api_action);
   activity_db->RecordAction(dom_action);
   activity_db->RecordAction(toonew_dom_action);
   activity_db->RecordAction(tooold_dom_action);
 
@@ skipping 102 matching lines @@
       APIAction::CALL,
       "brewster",
       "woooof",
       "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
 }
 
 }  // namespace